diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a1ea8841aa..87051431d0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,16 +10,11 @@ jobs:
       contents: "read"
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Docker Buildx
+      - name: Set up persistent Buildx builder
         uses: docker/setup-buildx-action@v3
-      - name: Restore GHA Build Cache
-        uses: actions/cache@v4
         with:
-          path: /tmp/.buildx-cache
-          key: buildx-${{ github.ref_name }}
-          restore-keys: |
-            buildx-
-      - name: Build via Make (docker-bake.hcl uses type=gha)
-        env:
-          BUILDKIT_CACHE_DIR: /tmp/.buildx-cache
+          install: true
+          use: true
+      - run: docker buildx du -v
+      - name: Build via Make
         run: make login-lint
diff --git a/Makefile b/Makefile
index 194d74cf6a..d8ce1f4a76 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ login-help:
 	@echo "  clean-cache-keys        - Remove all cache keys."
 
 login-lint-build:
-	docker buildx bake login-lint
+	docker buildx bake --provenance=false --pull login-lint
 
 login-lint-run:
 	docker run --rm $(LOGIN_LINT_TAG) lint
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 0d71d37f90..104e284a31 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,6 +1,6 @@
 target "defaults" {
   cache-from = ["type=gha,scope=image"]
-  cache-to   = ["type=gha,scope=image,mode=max"]
+  cache-to   = ["type=gha,scope=image,ignore-error=true,mode=max"]
 }
 
 target "login-pnpm" {