diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index d0e6345..fe712d7 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -34,6 +34,12 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -46,6 +52,9 @@ jobs:
         with:
           context: ./tools/${{ env.IMAGE_NAME }}
           push: true
+          platforms: linux/amd64,linux/arm64/v8
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           build-args: |
             node_version=${{ matrix.node }}
             ubuntu_version=${{ env.UBUNTU_VERSION }}
@@ -77,6 +86,12 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -89,6 +104,9 @@ jobs:
         with:
           context: ./tools/${{ env.IMAGE_NAME }}
           push: true
+          platforms: linux/amd64,linux/arm64/v8
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           build-args: |
             node_version=${{ matrix.node }}
             ubuntu_version=${{ env.UBUNTU_VERSION }}