diff --git a/.circleci/config.yml b/.circleci/config.yml
index a4a2cfef2884..d7acd9d6e5b6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,6 +10,13 @@ jobs:
       - run: docker push matrixdotorg/synapse:${CIRCLE_TAG}
       - run: docker push matrixdotorg/synapse:${CIRCLE_TAG}-py2
       - run: docker push matrixdotorg/synapse:${CIRCLE_TAG}-py3
+  dockerhubuploadreleasebranch:
+    machine: true
+    steps:
+      - checkout
+      - run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:${CIRCLE_BRANCH} --build-arg PYTHON_VERSION=3.7 .
+      - run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
+      - run: docker push matrixdotorg/synapse:${CIRCLE_TAG}
   dockerhubuploadlatest:
     machine: true
     steps:
@@ -89,8 +96,11 @@ workflows:
             tags:
               only: /v[0-9].[0-9]+.[0-9]+.*/
             branches:
-              only: shhs
               ignore: /.*/
+      - dockerhubuploadreleasebranch:
+          filters:
+            branches:
+              only: shhs
       - dockerhubuploadlatest:
           filters:
             branches: