diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml
index fb2554d..328404b 100644
--- a/.github/workflows/test_and_build.yml
+++ b/.github/workflows/test_and_build.yml
@@ -37,37 +37,47 @@ jobs:
       checks: write
       packages: write
     steps:
+      # Prepare the Docker build environment
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v3
+
       - uses: actions/checkout@v4
       # Build and push container image to GCR (only on main branch)
       - name: Log in to the GitHub Container Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push upload service container image to GitHub Container Registry
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: |
             ghcr.io/ardriveapp/${{ github.event.repository.name }}:latest
             ghcr.io/ardriveapp/${{ github.event.repository.name }}:${{ github.sha }}
 
       - name: Build and push fulfillment container image to GitHub Container Registry
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           file: Dockerfile.fulfillment
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: |
             ghcr.io/ardriveapp/${{ github.event.repository.name }}-fulfillment:latest
             ghcr.io/ardriveapp/${{ github.event.repository.name }}-fulfillment:${{ github.sha }}
 
       - name: Build and push localstack container image to GitHub Container Registry
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           file: Dockerfile.localstack
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: |
             ghcr.io/ardriveapp/${{ github.event.repository.name }}-localstack:latest
             ghcr.io/ardriveapp/${{ github.event.repository.name }}-localstack:${{ github.sha }}