diff --git a/.github/workflows/docker.build.yaml b/.github/workflows/docker.build.yaml
index ce8c96e..1817fbb 100644
--- a/.github/workflows/docker.build.yaml
+++ b/.github/workflows/docker.build.yaml
@@ -14,8 +14,6 @@ jobs:
     strategy:
       matrix:
         php: [ 8.1.31, 8.2.27, 8.3.16, 8.4.3 ]
-    # downgraded from latest (being 24.04) due to https://3.basecamp.com/3923521/buckets/6162023/card_tables/cards/8268321367
-    # runs-on: ubuntu-22.04
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -57,12 +55,7 @@ jobs:
       - name: Set up QEMU
         id: qemu
         uses: docker/setup-qemu-action@v3
-        # commented, as tonistiigi/binfmt:latest has been updated. Remove, if it works.
-        #with:
-          # setup-qemu-action by default uses tonistiigi/binfmt:latest,
-          # which is out of date, see https://github.com/tonistiigi/binfmt/issues/165.
-          # This causes seg faults during build.
-          #image: tonistiigi/binfmt:qemu-v8.1.5
+
       -
         name: Set up Docker Buildx
         id: buildx
@@ -91,8 +84,8 @@ jobs:
             PHP_VERSION=${{ matrix.php }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=php-${{ matrix.php }}-platform-${{ inputs.platform }}
+          cache-to: type=gha,mode=max,scope=php-${{ matrix.php }}-platform-${{ inputs.platform }}
 
   announce:
     runs-on: ubuntu-latest