diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b8329ef..5b06cd2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -18,7 +18,6 @@ jobs:
     permissions:
       contents: read
       packages: write
-
     steps:
       -
         name: Checkout
@@ -30,11 +29,11 @@ jobs:
           registry: ghcr.io
           username: ${{github.actor}}
           password: ${{secrets.GITHUB_TOKEN}}
-#      -
-#        # Add support for more platforms with QEMU (optional)
-#        # https://github.com/docker/setup-qemu-action
-#        name: Set up QEMU
-#        uses: docker/setup-qemu-action@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: ${{ matrix.platform }}
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -42,19 +41,23 @@ jobs:
         name: Build Klipper
         uses: docker/build-push-action@v6
         with:
+          platforms: linux/amd64, linux/arm64
           context: .
-          cache-from: type=registry,ref=ghcr.io/nelsongraca/kdock-klipper:buildcache
-          cache-to: type=registry,ref=ghcr.io/nelsongraca/kdock-klipper:buildcache,mode=max
+          cache-from: type=registry,ref=ghcr.io/nelsongraca/kdock-cache:buildcache
+          cache-to: type=registry,ref=ghcr.io/nelsongraca/kdock-cache:buildcache,mode=max
           push: true
+          provenance: false
           tags: ghcr.io/nelsongraca/kdock-klipper:latest
           target: klipper
       -
         name: Build Moonraker
         uses: docker/build-push-action@v6
         with:
+          platforms: linux/amd64, linux/arm64
           context: .
-          cache-from: type=registry,ref=ghcr.io/nelsongraca/kdock-moonraker:buildcache
-          cache-to: type=registry,ref=ghcr.io/nelsongraca/kdock-moonraker:buildcache,mode=max
+          cache-from: type=registry,ref=ghcr.io/nelsongraca/kdock-cache:buildcache
+          cache-to: type=registry,ref=ghcr.io/nelsongraca/kdock-cache:buildcache,mode=max
           push: true
+          provenance: false
           tags: ghcr.io/nelsongraca/kdock-moonraker:latest
           target: moonraker