diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
index ebf1d6da..ae1cbfe8 100644
--- a/.github/workflows/docker-push.yml
+++ b/.github/workflows/docker-push.yml
@@ -1,40 +1,97 @@
 name: Publish Docker image
 
+env:
+  DOCKER_IMAGE: katanemo/archgw
+
 on:
-  release:
-    types: [published]
+  push:
+    branches:
+      - main
 
 jobs:
-  push_to_registry:
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-      attestations: write
-      id-token: write
+  # Build ARM64 image on native ARM64 runner
+  build-arm64:
+    runs-on: [linux-arm64]
     steps:
-      - name: Check out the repo
+      - name: Checkout Repository
         uses: actions/checkout@v4
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        uses: docker/metadata-action@v5
         with:
-          images: katanemo/archgw
+          images: ${{ env.DOCKER_IMAGE }}
+          tags: |
+            type=raw,value=latest  # Force the tag to be "latest"
 
-      - name: Build and push Docker image
-        id: push
-        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+      - name: Build and Push ARM64 Image
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./arch/Dockerfile
+          platforms: linux/arm64
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta.outputs.tags }}-arm64
+
+  # Build AMD64 image on GitHub's AMD64 runner
+  build-amd64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.DOCKER_IMAGE }}
+          tags: |
+            type=raw,value=latest  # Force the tag to be "latest"
+
+      - name: Build and Push AMD64 Image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./arch/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}-amd64
+
+
+  # Combine ARM64 and AMD64 images into a multi-arch manifest
+  create-manifest:
+    runs-on: ubuntu-latest
+    needs: [build-arm64, build-amd64]  # Wait for both builds
+    steps:
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.DOCKER_IMAGE }}
+          tags: |
+            type=raw,value=latest  # Force the tag to be "latest"
+
+      - name: Create Multi-Arch Manifest
+        run: |
+          # Combine the architecture-specific images into a "latest" manifest
+          docker buildx imagetools create -t ${{ steps.meta.outputs.tags }} \
+            ${{ env.DOCKER_IMAGE }}:latest-arm64 \
+            ${{ env.DOCKER_IMAGE }}:latest-amd64