diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 1d1d6a6..0eee0d8 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -51,8 +51,9 @@ jobs:
           tags: |
             dronecode/roscon-25-workshop:latest-${{ matrix.arch }}
             dronecode/roscon-25-workshop:sha-${{ github.sha }}-${{ matrix.arch }}
-          cache-from: type=gha,version=1
-          cache-to: type=gha,version=1,mode=max
+          cache-from: type=gha,version=1,scope=${{ matrix.arch }}
+          cache-to: type=gha,version=1,mode=max,scope=${{ matrix.arch }}
+
 
   deploy_arch_images:
     name: Deploying to Registry