diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 0c92bd6..3d62394 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -110,12 +110,13 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha,scope=frontend
-          cache-to: type=gha,mode=max,scope=frontend
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           build-args: |
             NEXT_PUBLIC_FLASK_BACKEND_URL=${{ vars.NEXT_PUBLIC_FLASK_BACKEND_URL || '' }}
             NEXT_PUBLIC_BASE_PATH=${{ vars.NEXT_PUBLIC_BASE_PATH || '' }}
+          provenance: false
diff --git a/Dockerfile b/Dockerfile
index 4f89310..8715c91 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,10 +13,11 @@ COPY . .
 # Build arguments for environment variables
 ARG NEXT_PUBLIC_FLASK_BACKEND_URL
 ARG NEXT_PUBLIC_BASE_PATH
+ARG TARGETPLATFORM
 ENV NEXT_PUBLIC_FLASK_BACKEND_URL=$NEXT_PUBLIC_FLASK_BACKEND_URL
 ENV NEXT_PUBLIC_BASE_PATH=$NEXT_PUBLIC_BASE_PATH
 
-# Build Next.js app
+# Build Next.js app with platform-specific output dir to avoid conflicts
 RUN npm run build
 
 # Production stage