diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index edaeed5264e01963663dcb7fa83b83b3111ed205..d1b41d728837a93f177fdc8b78507a0a5da29e3d 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -23,6 +23,7 @@ on:
 
 env:
   TEST_TAG: horaceworblehat/borg-server:test
+  CACHE_TAG: horaceworblehat/borg-server:buildcache
 
 jobs:
   docker:
@@ -84,8 +85,8 @@ jobs:
         with:
           load: true
           tags: ${{ env.TEST_TAG }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=registry,ref=${{ env.TEST_TAG }}
+          cache-to: type=registry,ref=${{ env.TEST_TAG }},mode=max
 
 
       - name: Run small selftest on build container image
@@ -102,8 +103,10 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=registry,ref=${{ env.TEST_TAG }}
+          cache-to: type=registry,ref=${{ env.TEST_TAG }},mode=max
+
+
 
       - name: Sign image with a key
         run: |