diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
index dbf80bd3..3749688d 100644
--- a/.github/workflows/build_test_deploy.yml
+++ b/.github/workflows/build_test_deploy.yml
@@ -134,7 +134,7 @@ jobs:
           load: false
           push: false
           set: |
-            *.cache-to=type=gha,scope=build-${{ matrix.target }}-${{ github.ref }}-${{ github.run_id }},mode=min
+            *.cache-to=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-${{ matrix.target }}-build,mode=min
             *.platform=${{ inputs.architecture }}
 
 # This job runs all the tests.
@@ -189,20 +189,20 @@ jobs:
           load: true
           push: false
           set: |
-            *.cache-from=type=gha,scope=build-docs-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-setup-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-admin-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-antispam-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-front-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-imap-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-smtp-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-snappymail-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-roundcube-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-antivirus-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-fetchmail-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-resolver-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-traefik-certdumper-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-webdav-${{ github.ref }}-${{ github.run_id }}
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-docs-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-setup-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-admin-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-antispam-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-front-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-imap-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-smtp-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-snappymail-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-roundcube-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-antivirus-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-fetchmail-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-resolver-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-traefik-certdumper-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-webdav-build
             *.platform=${{ inputs.architecture }}
       - name: Install python packages
         run: python3 -m pip install -r tests/requirements.txt
@@ -254,20 +254,20 @@ jobs:
           files: ${{env.HCL_FILE}}
           push: true
           set: |
-            *.cache-from=type=gha,scope=build-docs-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-setup-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-admin-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-antispam-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-front-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-imap-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-smtp-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-snappymail-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-roundcube-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-antivirus-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-fetchmail-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-resolver-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-traefik-certdumper-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-webdav-${{ github.ref }}-${{ github.run_id }}
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-docs-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-setup-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-admin-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-antispam-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-front-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-imap-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-smtp-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-snappymail-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-roundcube-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-antivirus-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-fetchmail-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-resolver-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-traefik-certdumper-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-webdav-build
             *.platform=${{ inputs.architecture }}
 
   deploy-arm:
@@ -306,20 +306,20 @@ jobs:
           files: ${{env.HCL_FILE}}
           push: true
           set: |
-            *.cache-from=type=gha,scope=build-docs-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-setup-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-admin-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-antispam-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-front-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-imap-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-smtp-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-snappymail-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-roundcube-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-antivirus-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-fetchmail-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-resolver-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-traefik-certdumper-${{ github.ref }}-${{ github.run_id }}
-            *.cache-from=type=gha,scope=build-webdav-${{ github.ref }}-${{ github.run_id }}
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-docs-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-setup-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-admin-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-antispam-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-front-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-imap-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-smtp-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-snappymail-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-roundcube-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-antivirus-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-fetchmail-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-resolver-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-traefik-certdumper-build
+            *.cache-from=type=gha,scope=${{ github.run_id }}-${{ github.ref }}-webdav-build
             *.platform=${{ inputs.architecture }}
 
 #This job creates a tagged release. A tag is created for the pinned version x.y.z. The GH release refers to this tag.