diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index f7a909afa8..65accf6058 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -27,24 +27,39 @@ jobs:
             return tagName;
           result-encoding: string
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+           username: ${{ secrets.DOCKERHUB_USERNAME }}
+           password: ${{ secrets.DOCKERHUB_PASSWORD }}
+     
       - name: Build and push Dev Docker image
-        uses: docker/build-push-action@v1
+        uses: docker/build-push-action@v4
         with:
           push: true
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
           target: dev
           repository: edxops/discovery-dev
-          tags: ${{ steps.get-tag-name.outputs.result }},${{ github.sha }}
+          tags: |
+            edxops/discovery-dev:${{ steps.get-tag-name.outputs.result }}
+            edxops/discovery-dev:${{ github.sha }}
+          platforms: linux/amd64,linux/arm64
 
       # The current priority is to get the devstack off of Ansible based Images. Once that is done, we can come back to this part to get
       # suitable images for smaller prod environments.
       # - name: Build and push prod Docker image
-      #   uses: docker/build-push-action@v1
+      #   uses: docker/build-push-action@v4
       #   with:
       #     push: true
-      #     username: ${{ secrets.DOCKERHUB_USERNAME }}
-      #     password: ${{ secrets.DOCKERHUB_PASSWORD }}
       #     target: prod
       #     repository: edxops/discovery-prod
       #     tags: ${{ steps.get-tag-name.outputs.result }},${{ github.sha }}
+      #     tags: |
+      #       edxops/discovery-prod:${{ steps.get-tag-name.outputs.result }}
+      #       edxops/discovery-prod:${{ github.sha }}
+      #     platforms: linux/amd64,linux/arm64