diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3850c3b..a892f9c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,32 +9,40 @@ on:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
-    
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
-      
+        
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v2
+
+      - name: Build and push Docker image for main
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/filekeeper:${{ github.ref_name }}
             ${{ secrets.DOCKERHUB_USERNAME }}/filekeeper:latest
+          platforms: linux/amd64,linux/arm64
         if: github.ref == 'refs/heads/main'
-      
+
       - name: Build and push Docker image for staging
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/filekeeper:staging
+          platforms: linux/amd64,linux/arm64
         if: github.ref == 'refs/heads/staging'