diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index cd411b55..a8424e82 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -110,8 +110,8 @@ jobs:
           CHECKPOINT_SYNC=${{ github.event.inputs.checkpoint_sync || true }}
           SENTRY_DSN=${{ secrets.SENTRY_ENDPOINT }}
         push: true
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
+        cache-from: type=registry,ref=${{ env.GAR_BASE }}/${{ env.GITHUB_REF_SLUG_URL }}:buildcache
+        cache-to: type=registry,ref=${{ env.GAR_BASE }}/${{ env.GITHUB_REF_SLUG_URL }}:buildcache,mode=max
 
   deploy-nodes:
     name: Deploy Mainnet nodes
diff --git a/.github/workflows/test-full-sync.yml b/.github/workflows/test-full-sync.yml
index c595ddaf..79e9eec9 100644
--- a/.github/workflows/test-full-sync.yml
+++ b/.github/workflows/test-full-sync.yml
@@ -112,8 +112,8 @@ jobs:
             RUST_LOG=debug
             SENTRY_DSN=${{ secrets.SENTRY_ENDPOINT }}
           push: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=registry,ref=${{ env.GAR_BASE }}/${{ env.IMAGE_NAME }}:buildcache
+          cache-to: type=registry,ref=${{ env.GAR_BASE }}/${{ env.IMAGE_NAME }}:buildcache,mode=max
 
   # Test that Zebra can run a full mainnet sync after a PR is approved
   test-full-sync:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f3caa79f..3287f655 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -113,8 +113,8 @@ jobs:
             RUST_LOG=debug
             SENTRY_DSN=${{ secrets.SENTRY_ENDPOINT }}
           push: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=registry,ref=${{ env.GAR_BASE }}/${{ env.IMAGE_NAME }}:buildcache
+          cache-to: type=registry,ref=${{ env.GAR_BASE }}/${{ env.IMAGE_NAME }}:buildcache,mode=max
 
   # Run all the zebra tests, including tests that are ignored by default
   test-all:
diff --git a/.github/workflows/zcash-lightwalletd.yml b/.github/workflows/zcash-lightwalletd.yml
index 16890872..c74ea986 100644
--- a/.github/workflows/zcash-lightwalletd.yml
+++ b/.github/workflows/zcash-lightwalletd.yml
@@ -104,5 +104,5 @@ jobs:
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
         push: true
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
+        cache-from: type=registry,ref=${{ env.GAR_BASE }}/${{ env.IMAGE_NAME }}:buildcache
+        cache-to: type=registry,ref=${{ env.GAR_BASE }}/${{ env.IMAGE_NAME }}:buildcache,mode=max
diff --git a/.github/workflows/zcash-params.yml b/.github/workflows/zcash-params.yml
index 5d124137..b6cb84e5 100644
--- a/.github/workflows/zcash-params.yml
+++ b/.github/workflows/zcash-params.yml
@@ -100,5 +100,5 @@ jobs:
           ZEBRA_SKIP_IPV6_TESTS="1"
           SENTRY_DSN=${{ secrets.SENTRY_ENDPOINT }}
         push: true
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
+        cache-from: type=registry,ref=${{ env.GAR_BASE }}/${{ env.IMAGE_NAME }}:buildcache
+        cache-to: type=registry,ref=${{ env.GAR_BASE }}/${{ env.IMAGE_NAME }}:buildcache,mode=max