diff --git a/.github/workflows/image-push.yml b/.github/workflows/image-push.yml
index 801a786..5fc6942 100644
--- a/.github/workflows/image-push.yml
+++ b/.github/workflows/image-push.yml
@@ -7,6 +7,11 @@ env:
 
 jobs:
   push-multiarch:
+     strategy:
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
     permissions:
       contents: read
       id-token: write
@@ -39,16 +44,29 @@ jobs:
         username: ${{ env.DOCKER_USERNAME }}
         password: ${{ env.DOCKER_PASSWORD }}
 
-    - name: Build container image for Linux
+    - name: Build container image for arm64
       uses: docker/build-push-action@v5
       with:
         context: .
         push: true
         tags: rancher/hardened-containerd:${{ github.event.release.tag_name }}
         file: Dockerfile
-        platforms: linux/amd64, linux/arm64
+        platforms: linux/arm64
         build-args: |
           TAG=${{ env.TAG }}
+          ARCH=arm64
+
+    - name: Build container image for amd64
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        push: true
+        tags: rancher/hardened-containerd:${{ github.event.release.tag_name }}
+        file: Dockerfile
+        platforms: linux/amd64
+        build-args: |
+          TAG=${{ env.TAG }}
+          ARCH=amd64
 
     - name: Build container image for Windows
       uses: docker/build-push-action@v5