diff --git a/.github/workflows/base-build.yml b/.github/workflows/base-build.yml
index 2728737..c1a55cc 100644
--- a/.github/workflows/base-build.yml
+++ b/.github/workflows/base-build.yml
@@ -61,8 +61,9 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v4
         with:
-          cleanup: false
+          name: buildx-${{ inputs.version }}-${{ steps.compute_variants.outputs.variant }}
           platforms: ${{ steps.qemu.outputs.platforms }}
+          cleanup: false
       - name: Login to GHCR
         uses: docker/login-action@v4
         with:
@@ -83,11 +84,11 @@ jobs:
             BUILDKIT_INLINE_CACHE=1
           secrets: |
             github_token=${{ secrets.GITHUB_TOKEN }}
-          pull: ${{ github.run_attempt == 1 }}
           builder: ${{ steps.buildx.outputs.name }}
           platforms: linux/amd64,linux/arm64
           provenance: mode=max
           sbom: true
+          pull: true
           push: true
           cache-from: ${{ github.event_name != 'workflow_dispatch' && format('type=registry,ref=ghcr.io/{0}/cache/php:{1}-{2}', github.repository_owner, inputs.version, steps.compute_variants.outputs.variant) || '' }}
           cache-to: type=registry,mode=max,ref=${{ format('ghcr.io/{0}/cache/php:{1}-{2}', github.repository_owner, inputs.version, steps.compute_variants.outputs.variant) }}
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index db0c351..5bfff7c 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -42,7 +42,7 @@ jobs:
     secrets: inherit
   base-images:
     strategy:
-      max-parallel: 4
+      max-parallel: 8
       matrix:
         version:
           - '8.2.30'
diff --git a/.github/workflows/image-build.yml b/.github/workflows/image-build.yml
index d6831a2..cfc69db 100644
--- a/.github/workflows/image-build.yml
+++ b/.github/workflows/image-build.yml
@@ -90,8 +90,9 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v4
         with:
-          cleanup: false
+          name: buildx-${{ inputs.version }}-${{ steps.compute_variants.outputs.base_variant_os }}
           platforms: ${{ steps.qemu.outputs.platforms }}
+          cleanup: false
       - name: Login to Dockerhub
         uses: docker/login-action@v4
         with:
@@ -122,8 +123,8 @@ jobs:
             php-${{ inputs.version }}-${{ steps.compute_variants.outputs.base_variant_os }}=docker-image://ghcr.io/${{ github.repository_owner }}/cache/php:${{ inputs.version }}-${{ steps.compute_variants.outputs.base_variant_os }}-prebuild
           cache-from: type=gha,scope=${{ format('{0}-{1}-{2}', github.repository_owner, inputs.version, steps.compute_variants.outputs.base_variant_os) }}
           cache-to: ${{ steps.compute_variants.outputs.variant_os == steps.compute_variants.outputs.base_variant_os && format('type=gha,mode=min,scope={0}-{1}-{2}', github.repository_owner, inputs.version, steps.compute_variants.outputs.base_variant_os) || '' }}
-          pull: ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'}}
           builder: ${{ steps.buildx.outputs.name }}
+          pull: true
           platforms: linux/amd64,linux/arm64
           provenance: mode=max
           sbom: true