diff --git a/.github/workflows/build-zts.yml b/.github/workflows/build-zts.yml
index c8dfc39cf..79a3f5911 100644
--- a/.github/workflows/build-zts.yml
+++ b/.github/workflows/build-zts.yml
@@ -59,7 +59,7 @@ jobs:
   build-and-push:
     name: Build PHP v${{ matrix.version }}
     needs: generate-matrix
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     if: needs.generate-matrix.outputs.matrix != '{"include":[]}'
     strategy:
       fail-fast: false
@@ -69,10 +69,10 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: useblacksmith/setup-docker-builder@v1
 
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -80,7 +80,7 @@ jobs:
 
       - name: Extract metadata
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: ghcr.io/${{ github.repository_owner }}/php-fpm-zts
           tags: |
@@ -89,7 +89,7 @@ jobs:
 
       - name: Build and push Docker image
         id: build
-        uses: docker/build-push-action@v6
+        uses: useblacksmith/build-push-action@v2
         with:
           context: ./${{ matrix.directory }}
           push: true
@@ -97,8 +97,6 @@ jobs:
             ghcr.io/${{ github.repository_owner }}/php-fpm-zts:${{ matrix.version }}
             ghcr.io/${{ github.repository_owner }}/php-fpm-zts:${{ matrix.patch }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
 
       - name: Image digest
         run: echo ${{ steps.build.outputs.digest }}
diff --git a/.github/workflows/verify-templating.yml b/.github/workflows/verify-templating.yml
index e822ba6bb..75c917479 100644
--- a/.github/workflows/verify-templating.yml
+++ b/.github/workflows/verify-templating.yml
@@ -14,6 +14,6 @@ jobs:
     name: Check For Uncomitted Changes
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - run: ./apply-templates.sh
       - run: git diff --exit-code