diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 5ec4abcb..15d0c245 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -124,8 +124,8 @@ jobs:
           tags: ${{ steps.compute.outputs.ghcr_tags }}
           build-args: |
             BASE_PATH=${{ matrix.base_path }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=${{ matrix.type }}
+          cache-to: type=gha,mode=max,scope=${{ matrix.type }}
 
       - name: Build and push to Docker Hub
         if: github.repository == 'umami-software/umami'