diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 184154526e..548f65b278 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,15 +13,10 @@ jobs:
       - name: Set up persistent Buildx builder
         uses: docker/setup-buildx-action@v3
         with:
-          driver: docker-container
-          driver-opts: image=moby/buildkit:latest
           install: true
-          use: true
-          name: gha-builder
-          cleanup: false
-      - run: docker buildx du --builder gha-builder
+      - run: docker buildx du
       - name: Build via Make
         run: make login-lint
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - run: docker buildx du --builder gha-builder
+      - run: docker buildx du
diff --git a/Makefile b/Makefile
index 568be9ec91..4bd79a63da 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 --builder gha-builder --provenance=false --pull login-lint
+	docker buildx bake --builder default --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 ebdb72ba35..5ad6862df1 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -39,10 +39,9 @@ target "login-lint" {
   tags = ["${LOGIN_LINT_TAG}"]
   output = [
     "type=docker",
-    "type=cacheonly"
   ]
-  cache-from = ["type=gha,scope=image"]
-  cache-to   = ["type=gha,scope=image,ignore-error=true,mode=max"]
+  cache-from = ["type=gha"]
+  cache-to   = ["type=gha,ignore-error=true,mode=max"]
 }
 
 target "login-client" {