diff --git a/circle.yml b/circle.yml
index f6a1eda58621daed0a7aba3b4bf1e3f481808de1..bf00b3536768df05d54c723576ada7be12547a00 100644
--- a/circle.yml
+++ b/circle.yml
@@ -42,6 +42,7 @@ deployment:
     commands:
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
       - tests/build_tool.sh
+      - "docker tag quay.io/eris/db:build throw:build && docker rmi quay.io/eris/db:build"
       - docker push quay.io/eris/db
       - docs/build.sh master
   develop:
@@ -49,5 +50,6 @@ deployment:
     commands:
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
       - tests/build_tool.sh
+      - "docker rmi quay.io/eris/db:latest && docker tag quay.io/eris/db:build throw:build && docker rmi quay.io/eris/db:build"
       - docker push quay.io/eris/db
       - docs/build.sh
diff --git a/tests/build_tool.sh b/tests/build_tool.sh
index 2d1d9384ebbe60a49d58cb2205ad2e2d37fffeae..523de1a412fadcce3ed03daca77ff8b6bb4b2708 100755
--- a/tests/build_tool.sh
+++ b/tests/build_tool.sh
@@ -41,7 +41,7 @@ docker run --rm --entrypoint cat $IMAGE:build /usr/local/bin/eris-client > $REPO
 docker build -t $IMAGE:$release_min -f Dockerfile.deploy $REPO
 
 # Cleanup
-rm $REPO/$TARGET
+rm $REPO/"$TARGET"_build_artifact
 rm $REPO/eris-client
 
 # Extra Tags