diff --git a/.circleci/config.yml b/.circleci/config.yml
index 95fe412..a3b8758 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,7 +30,24 @@ jobs:
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker build --pull --build-arg "DOCKER_COMPOSE_VER=$LATEST_TAG" -t $DOCKERHUB_DESTINATION -f "$DOCKERHUB_DOCKEFILE" .
             sudo docker push $DOCKERHUB_DESTINATION
-
+  publish_multiarch:
+    machine:
+      enabled: true
+      image: circleci/classic:201808-01
+    steps:
+      - run:
+          command: |
+            # Turn on Experimental features
+            sudo mkdir $HOME/.docker
+            sudo sh -c 'echo "{ \"experimental\": \"enabled\" }" >> $HOME/.docker/config.json'
+            LATEST_TAG="${CIRCLE_TAG:1}"
+            DOCKERHUB_REPO="btcpayserver/docker-compose-builder"
+            DOCKERHUB_DESTINATION="$DOCKERHUB_REPO:$LATEST_TAG"
+            #
+            sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
+            sudo docker manifest create --amend $DOCKERHUB_DESTINATION-arm32v7
+            sudo docker manifest annotate $DOCKERHUB_DESTINATION $DOCKERHUB_DESTINATION-arm32v7 --os linux --arch arm --variant v7
+            sudo docker manifest push $DOCKERHUB_DESTINATION -p
 workflows:
   version: 2
   publish:
@@ -41,3 +58,11 @@ workflows:
               ignore: /.*/
             tags:
               only: /v[0-9]+(\.[0-9]+)*/
+      - publish_multiarch:
+          requires:
+            - publish_linuxarm32v7
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /v[0-9]+(\.[0-9]+)*/