diff --git a/.github/workflows/test-wallaby.yml b/.github/workflows/test-wallaby.yml
index d819012..436c21d 100644
--- a/.github/workflows/test-wallaby.yml
+++ b/.github/workflows/test-wallaby.yml
@@ -15,8 +15,8 @@
       uses: docker/build-push-action@v3.1.1
       with:
         context: images/openstack
-        cache-from: type=registry,ref=quay.io/vexxhost/keystone:wallaby
-        cache-to: type=inline
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
         push: true
         platforms: linux/amd64
         build-args: 'RELEASE=wallaby
diff --git a/hack/generate-github-workflows b/hack/generate-github-workflows
index 70bdaba..4cb9c28 100755
--- a/hack/generate-github-workflows
+++ b/hack/generate-github-workflows
@@ -71,8 +71,8 @@
         "uses": "docker/build-push-action@v3.1.1",
         "with": {
             "context": "images/openstack",
-            "cache-from": f"type=registry,ref=quay.io/vexxhost/{project}:{release}",
-            "cache-to": "type=inline",
+            "cache-from": "type=gha",
+            "cache-to": "type=gha,mode=max",
             "push": True,
             "platforms": get_platforms_for_project(project),
             "build-args": "\n".join([f"{k}={v}" for k, v in build_args.items()]),