diff --git a/.github/workflows/test-docker-build.yml b/.github/workflows/test-docker-build.yml
index 797b725..e85e819 100644
--- a/.github/workflows/test-docker-build.yml
+++ b/.github/workflows/test-docker-build.yml
@@ -41,28 +41,36 @@ jobs:
       - name: Copy env
         run: |
           cp .env.example .env
+          
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          driver-opts: |
+            network=stack
 
       - name: Start database
         run: |
           docker compose up -d database
-          
-      # - name: Build and push image
-      #   id: docker_build
-      #   uses: docker/build-push-action@v2
-      #   with:
-      #     context: ./
-      #     file: ./Dockerfile
-      #     push: false
-      #     # The test image is /docker and is private. final image will be /calendso and public
-      #     tags: docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/calendso:canary
-      #     network: stack
-      #     build-args: |
-      #       BASE_URL=http://localhost:3000
-      #       NEXT_PUBLIC_APP_URL=http://localhost:3000
-      #       DATABASE_URL=${DATABASE_URL}
-      - name: Build with docker compose
-        run: |
-          DOCKER_BUILDKIT=0 docker compose build calcom
+              
+      - name: Build and push image
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: ./
+          file: ./Dockerfile
+          push: false
+          platforms: linux/amd64,linux/arm64
+          # The test image is /docker and is private. final image will be /calendso and public
+          tags: docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/calendso:canary
+#           network: stack
+          build-args: |
+            BASE_URL=http://localhost:3000
+            NEXT_PUBLIC_APP_URL=http://localhost:3000
+            DATABASE_URL=${DATABASE_URL}
+            
+#       - name: Build with docker compose
+#         run: |
+#           DOCKER_BUILDKIT=0 docker compose build calcom
 
       - name: Cleanup
         run: |