diff --git a/DOCKER/build.sh b/DOCKER/build.sh
index ca15ec095db86f8a1002d73826b3fa1a74bcb082..0ab7e88a4d51b96f3278326484567cef5015c6cb 100755
--- a/DOCKER/build.sh
+++ b/DOCKER/build.sh
@@ -19,8 +19,8 @@ cd $repo
 
 if [ "$branch" = "master" ]; then
   docker build -t $image_base:latest -f DOCKER/Dockerfile .
-  docker tag -f $image_base:latest $image_base:$release_maj
-  docker tag -f $image_base:latest $image_base:$release_min
+  docker tag $image_base:latest $image_base:$release_maj
+  docker tag $image_base:latest $image_base:$release_min
 else
   docker build -t $image_base:$release_min -f DOCKER/Dockerfile .
 fi
diff --git a/circle.yml b/circle.yml
index fd13c3f1c02b5055e9d46733faa6045bba926fb7..1b5a2212739c371645aa7926830233079f777ee1 100644
--- a/circle.yml
+++ b/circle.yml
@@ -17,6 +17,7 @@ dependencies:
     - sudo service docker start
     - "sudo apt-get update && sudo apt-get install -y libgmp3-dev"
     - sudo curl -sSL -o /usr/bin/docker-machine https://github.com/docker/machine/releases/download/v${DOCKER_MACHINE_VERSION}/docker-machine_linux-amd64; sudo chmod 0755 /usr/bin/docker-machine
+    - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
     - "cd ./cmd/erisdb && go get -d && go build"
     - "mv ~/eris-db/cmd/erisdb/erisdb ~/bin"
     - chmod +x ~/bin/erisdb
@@ -29,12 +30,10 @@ deployment:
   master:
     branch: master
     commands:
-      - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
       - DOCKER/build.sh
       - docker push quay.io/eris/erisdb
   develop:
     branch: develop
     commands:
-      - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
       - DOCKER/build.sh
       - docker push quay.io/eris/erisdb
\ No newline at end of file