diff --git a/circle.yml b/circle.yml
index 181f21495b9f967be4192216c515cbe10a52d8ff..f6a1eda58621daed0a7aba3b4bf1e3f481808de1 100644
--- a/circle.yml
+++ b/circle.yml
@@ -40,14 +40,14 @@ deployment:
   master:
     branch: master
     commands:
-      - tests/build_tool.sh
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
-      - docker push quay.io/eris/erisdb
+      - tests/build_tool.sh
+      - docker push quay.io/eris/db
       - docs/build.sh master
   develop:
     branch: develop
     commands:
-      - tests/build_tool.sh
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
-      - docker push quay.io/eris/erisdb
+      - tests/build_tool.sh
+      - docker push quay.io/eris/db
       - docs/build.sh
diff --git a/tests/build_tool.sh b/tests/build_tool.sh
index b51f4b1159a6bcfbac6094f62445e77e39248b09..2d1d9384ebbe60a49d58cb2205ad2e2d37fffeae 100755
--- a/tests/build_tool.sh
+++ b/tests/build_tool.sh
@@ -43,10 +43,6 @@ docker build -t $IMAGE:$release_min -f Dockerfile.deploy $REPO
 # Cleanup
 rm $REPO/$TARGET
 rm $REPO/eris-client
-if [ "$CI" ]
-then
-  docker rmi $IMAGE:build
-fi
 
 # Extra Tags
 if [[ "$branch" = "master" ]]