diff --git a/.github/workflows/docker-build-and-publish.yaml b/.github/workflows/docker-build-and-publish.yaml
index 2264e69c5..b92d1c552 100644
--- a/.github/workflows/docker-build-and-publish.yaml
+++ b/.github/workflows/docker-build-and-publish.yaml
@@ -147,5 +147,5 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=${{ inputs.image-name }}-${{ inputs.image-tag-flavor }}
+          cache-to: type=gha,mode=max,scope=${{ inputs.image-name }}-${{ inputs.image-tag-flavor }}