diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index b3225cf8..024328bd 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -40,15 +40,27 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - 
-        name: Build and export to Docker
+        name: Build x86 and export to Docker
         uses: docker/build-push-action@v2
         with:
           context: .
           load: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           tags: ${{ env.TAG }}
       -
-        name: Test
+        name: Test x86
+        run: |
+            docker run --rm --entrypoint apk add file; file netmaker ${{ env.TAG }}
+      -
+        name: Build arm and export to Docker
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          load: true
+          platforms: linux/arm64
+          tags: ${{ env.TAG }}
+      -
+        name: Test arm
         run: |
             docker run --rm --entrypoint apk add file; file netmaker ${{ env.TAG }}
       -