diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3fb180bbc..6f23d3d71 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -310,7 +310,8 @@ jobs:
     executor: dockerizer
     steps:
       - checkout
-      - setup_remote_docker
+      - setup_remote_docker:
+          version: "18.09.3"
       - run:
           name: Build Docker image
           command: |
@@ -326,7 +327,8 @@ jobs:
     executor: dockerizer
     steps:
       - checkout
-      - setup_remote_docker
+      - setup_remote_docker:
+          version: "18.09.3"
       - attach_workspace:
           at: /tmp/workspace
       - run:
@@ -374,12 +376,11 @@ workflows:
           - interop
           - go-ipfs-api
           - go-ipfs-http-client
-          - ipfs-webui  
+          - ipfs-webui
         filters:
           branches:
-            only: 
+            only:
               - master
-              - release
               - feat/stabilize-dht
 
   # NOTE: CircleCI only builds tags if you explicitly filter for them. That
diff --git a/bin/push-docker-tags.sh b/bin/push-docker-tags.sh
index 973b0fa7d..faee39986 100755
--- a/bin/push-docker-tags.sh
+++ b/bin/push-docker-tags.sh
@@ -59,20 +59,17 @@ pushTag () {
   fi
 }
 
-if [[ $GIT_TAG =~ ^v[0-9]+ ]]; then 
+if [[ $GIT_TAG =~ ^v[0-9]+ ]]; then
   pushTag "$GIT_TAG"
+  pushTag "latest"
 
-elif [ "$GIT_BRANCH" = "feat/stabilize-dht" ]; then 
+elif [ "$GIT_BRANCH" = "feat/stabilize-dht" ]; then
   pushTag "bifrost-${BUILD_NUM}-${GIT_SHA1_SHORT}"
   pushTag "bifrost-latest"
 
-elif [ "$GIT_BRANCH" = "release" ]; then 
-  pushTag "release"
-  pushTag "latest"
-
-elif [ "$GIT_BRANCH" = "master" ]; then 
+elif [ "$GIT_BRANCH" = "master" ]; then
   pushTag "master-${BUILD_NUM}-${GIT_SHA1_SHORT}"
-  pushTag "master"
+  pushTag "master-latest"
 
 else
   echo "Nothing to do. No docker tag defined for branch: $GIT_BRANCH, tag: $GIT_TAG"