diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 356e009d74..c10a34bc06 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,16 @@ jobs:
       contents: "read"
     steps:
       - uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Restore GHA Build Cache
+        uses: actions/cache@v4
         with:
-          fetch-depth: 0
-      - uses: docker/setup-buildx-action@v3
-      - run: make login-quality
+          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
+        run: make login-quality