diff --git a/.github/workflows/docker-nightly.yaml b/.github/workflows/docker-nightly.yaml
index 9924664..94292c0 100644
--- a/.github/workflows/docker-nightly.yaml
+++ b/.github/workflows/docker-nightly.yaml
@@ -64,7 +64,7 @@ jobs:
             ARTICHOKE_NIGHTLY_VER=${{ steps.latest.outputs.commit }}
             RUST_VERSION=${{ steps.rust_toolchain.outputs.version }}
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=max,scope=docker-nightly-${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-v1
 
   debian-slim:
     name: Debian Slim
@@ -116,7 +116,7 @@ jobs:
             ARTICHOKE_NIGHTLY_VER=${{ steps.latest.outputs.commit }}
             RUST_VERSION=${{ steps.rust_toolchain.outputs.version }}
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=max,scope=docker-nightly-${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-v1
 
   alpine:
     name: Alpine
@@ -168,4 +168,4 @@ jobs:
             ARTICHOKE_NIGHTLY_VER=${{ steps.latest.outputs.commit }}
             RUST_VERSION=${{ steps.rust_toolchain.outputs.version }}
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=max,scope=docker-nightly-${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-v1
diff --git a/.github/workflows/dockerfile.yaml b/.github/workflows/dockerfile.yaml
index 73c150c..fd53a9c 100644
--- a/.github/workflows/dockerfile.yaml
+++ b/.github/workflows/dockerfile.yaml
@@ -28,7 +28,7 @@ jobs:
           file: ubuntu/focal/Dockerfile
           push: false
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=max,scope=docker-defaults-${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-v1
 
   debian-slim:
     name: Debian Slim
@@ -47,7 +47,7 @@ jobs:
           file: debian/bullseye/slim/Dockerfile
           push: false
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=max,scope=docker-defaults-${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-v1
 
   alpine:
     name: Alpine
@@ -66,4 +66,4 @@ jobs:
           file: alpine/Dockerfile
           push: false
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=max,scope=docker-defaults-${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-v1