diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 967decd..f33d619 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,12 +14,18 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Set up QEMU for multi-platform builds
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       - id: install-aws-cli
         uses: unfor19/install-aws-cli-action@v1
         with:
           version: 2
           verbose: true
-          arch: amd64
+          arch: arm64
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v2
@@ -30,7 +36,7 @@ jobs:
 
       - name: Build Docker image
         run: |
-          docker build --platform linux/arm64 -t hbd -f prod.Dockerfile .
+          docker buildx build --platform linux/arm64 -t hbd:latest -f prod.Dockerfile --load .
           docker tag hbd:latest hbd:latest
 
       - name: Push Docker image to ECR