diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5a4df533b158..ed1d54f2dfb7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -331,9 +331,18 @@ jobs:
           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
+  docker_tagged:
+    <<: *linux_defaults
+    steps:
+      - attach_workspace:
+          at: /tmp/workspace
+      - checkout
+      - setup_remote_docker:
+          docker_layer_caching: true
+      - run: |
+          docker build -t tendermint/gaia:$CIRCLE_TAG .
+          docker login -u $DOCKER_USER -p $DOCKER_PASS
+          docker push tendermint/gaia:$CIRCLE_TAG
 
 workflows:
   version: 2
@@ -347,6 +356,16 @@ workflows:
                 - develop
           requires:
             - setup_dependencies
+      - docker_tagged:
+          filters:
+            tags:
+              only:
+                - /^v.*/
+            branches:
+              ignore:
+                - /.*/
+          requires:
+            - setup_dependencies
       - macos_ci:
           filters:
             branches:
diff --git a/PENDING.md b/PENDING.md
index 521b868da05e..51dbc8970469 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -61,6 +61,7 @@ CLI flag.
 * \#3691 Cleanup error messages
 * \#3456 Integrate in the Int.ToDec() convenience function
 * [\#3300] Update the spec-spec, spec file reorg, and TOC updates.
+* [\#3694] Push tagged docker images on docker hub when tag is created.
 
 ### Tendermint
 
diff --git a/docs/gaia/deploy-testnet.md b/docs/gaia/deploy-testnet.md
index c3fed6b83139..2aa2f692e452 100644
--- a/docs/gaia/deploy-testnet.md
+++ b/docs/gaia/deploy-testnet.md
@@ -10,6 +10,16 @@ Supporting code can be found in the [networks directory](https://github.com/cosm
 
 > NOTE: The `remote` network bootstrapping may be out of sync with the latest releases and is not to be relied upon.
 
+## Available Docker images
+
+In case you need to use or deploy gaia as a container you could skip the `build` steps and use the official images, $TAG stands for the version you are interested in:
+- `docker run -it -v ~/.gaiad:/root/.gaiad -v ~/.gaiacli:/root/.gaiacli tendermint:$TAG gaiad init`
+- `docker run -it -p 26657:26657 -p 26656:26656 -v ~/.gaiad:/root/.gaiad -v ~/.gaiacli:/root/.gaiacli tendermint:$TAG gaiad start`
+- ...
+- `docker run -it -v ~/.gaiad:/root/.gaiad -v ~/.gaiacli:/root/.gaiacli tendermint:$TAG gaiacli version`
+
+The same images can be used to build your own docker-compose stack.
+
 ## Single-node, local, manual testnet
 
 This guide helps you create a single validator node that runs a network locally for testing and other development related uses.