diff --git a/.github/workflows/container-registry-ghcr.yaml b/.github/workflows/container-registry-ghcr.yaml
index 40020ca7..19760931 100644
--- a/.github/workflows/container-registry-ghcr.yaml
+++ b/.github/workflows/container-registry-ghcr.yaml
@@ -36,10 +36,15 @@ jobs:
             type=semver,pattern={{raw}}
             type=semver,pattern=v{{major}}.{{minor}}
             type=semver,pattern=v{{major}}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
           labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
diff --git a/Makefile.maker.yaml b/Makefile.maker.yaml
index f8f99f83..b0341f5a 100644
--- a/Makefile.maker.yaml
+++ b/Makefile.maker.yaml
@@ -36,6 +36,7 @@ githubWorkflow:
     enabled: true
   pushContainerToGhcr:
     enabled: true
+    platforms: linux/amd64,linux/arm64
   release:
     enabled: true
   securityChecks: