diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 8f3a77e0f7..ad05e4ea82 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -48,5 +48,5 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64,linux/arm/v7,linux/arm64
-          cache-from: type=gha,scope=${{ github.workflow }}
-          cache-to: type=gha,mode=max,scope=${{ github.workflow }}
+          cache-from: type=gha,scope=docker-release
+          cache-to: type=gha,mode=max,scope=docker-release
diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
index 7ce30af779..0cf36aca5c 100644
--- a/.github/workflows/docker-test.yml
+++ b/.github/workflows/docker-test.yml
@@ -38,8 +38,10 @@ jobs:
           load: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha,scope=${{ github.workflow }}
-          cache-to: type=gha,mode=max,scope=${{ github.workflow }}
+          cache-from: |
+            type=gha,scope=docker-test
+            type=gha,scope=docker-release
+          cache-to: type=gha,mode=max,scope=docker-test
 
       - name: Run dockerfile
         run: |