diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9efb455e119f..5a4df533b158 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -326,13 +326,15 @@ jobs:
             GAIAD_VERSION="stable"
           elif [ "${CIRCLE_BRANCH}" == "develop" ]; then
             GAIAD_VERSION="develop"
-          else
-            GAIAD_VERSION=`/tmp/workspace/bin/gaiad version`
           fi
           docker build -t tendermint/gaia:$GAIAD_VERSION .
           docker login -u $DOCKER_USER -p $DOCKER_PASS
           docker push tendermint/gaia:$GAIAD_VERSION
 
+          # Push the tag also for the version, so clients can build up on top of it
+          GAIAD_VERSION=`/tmp/workspace/bin/gaiad version`
+          docker push tendermint/gaia:$GAIAD_VERSION
+
 workflows:
   version: 2
   test-suite: