diff --git a/.github/workflows/action-build-and-push.yaml b/.github/workflows/action-build-and-push.yaml
index 2012287..4e9f848 100644
--- a/.github/workflows/action-build-and-push.yaml
+++ b/.github/workflows/action-build-and-push.yaml
@@ -26,6 +26,14 @@ on:
           Path to the Dockerfile relative to the repository root.
           Example: ./Dockerfile or ./services/api/Dockerfile
 
+      platforms:
+        type: string
+        required: false
+        default: linux/amd64,linux/arm64
+        description: >
+          Comma-separated list of target platforms to build.
+          Example: linux/amd64,linux/arm64
+
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
@@ -37,6 +45,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Set up QEMU (for cross-arch builds)
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm64
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -66,6 +79,7 @@ jobs:
         with:
           context: ${{ inputs.build_context }}
           file: ${{ inputs.file_path }}
+          platforms: ${{ inputs.platforms }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}