diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d8442ef9b..31844a704 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -67,8 +67,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/apache:sha-${{ github.sha }}-${{ matrix.arch }}-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/apache:alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/apache:alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -79,8 +80,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/apache:sha-${{ github.sha }}-${{ matrix.arch }}-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/apache:alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/apache:alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/base:alpine=oci-layout://.ci-oci-image/base_alpine:ci-parent-image'
       -
@@ -176,8 +178,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/base-app:sha-${{ github.sha }}-${{ matrix.arch }}-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/base-app:alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/base-app:alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -188,8 +191,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/base-app:sha-${{ github.sha }}-${{ matrix.arch }}-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/base-app:alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/base-app:alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/base:alpine=oci-layout://.ci-oci-image/base_alpine:ci-parent-image'
       -
@@ -290,8 +294,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/base-app:sha-${{ github.sha }}-${{ matrix.arch }}-ubuntu-22.04'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/base-app:ubuntu-22.04-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/base-app:ubuntu-22.04-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -302,8 +307,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/base-app:sha-${{ github.sha }}-${{ matrix.arch }}-ubuntu-22.04'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/base-app:ubuntu-22.04-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/base-app:ubuntu-22.04-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/base:ubuntu-22.04=oci-layout://.ci-oci-image/base_ubuntu-22-04:ci-parent-image'
       -
@@ -338,8 +344,8 @@ jobs:
         with:
           context: docker/base-app/ubuntu-22.04
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/base-app:ubuntu-22.04-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/base-app:ubuntu-22.04-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/base:ubuntu-22.04=oci-layout://.ci-oci-image/base_ubuntu-22-04:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/base-app_ubuntu-22-04'
@@ -351,6 +357,7 @@ jobs:
           name: 'docker-parent-base-app_ubuntu-22-04-${{ matrix.arch }}'
           path: .ci-oci-image/base-app_ubuntu-22-04
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   base-app_ubuntu-22-04_publish:
@@ -428,8 +435,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/base:sha-${{ github.sha }}-${{ matrix.arch }}-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/base:alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/base:alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -440,8 +448,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/base:sha-${{ github.sha }}-${{ matrix.arch }}-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/base:alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/base:alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/bootstrap:alpine=oci-layout://.ci-oci-image/bootstrap_alpine:ci-parent-image'
       -
@@ -476,8 +485,8 @@ jobs:
         with:
           context: docker/base/alpine
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/base:alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/base:alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/bootstrap:alpine=oci-layout://.ci-oci-image/bootstrap_alpine:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/base_alpine'
@@ -489,6 +498,7 @@ jobs:
           name: 'docker-parent-base_alpine-${{ matrix.arch }}'
           path: .ci-oci-image/base_alpine
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   base_alpine_publish:
@@ -564,8 +574,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/base:sha-${{ github.sha }}-${{ matrix.arch }}-ubuntu-22.04'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/base:ubuntu-22.04-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/base:ubuntu-22.04-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -576,8 +587,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/base:sha-${{ github.sha }}-${{ matrix.arch }}-ubuntu-22.04'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/base:ubuntu-22.04-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/base:ubuntu-22.04-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/bootstrap:ubuntu-22.04=oci-layout://.ci-oci-image/bootstrap_ubuntu-22-04:ci-parent-image'
       -
@@ -612,8 +624,8 @@ jobs:
         with:
           context: docker/base/ubuntu-22.04
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/base:ubuntu-22.04-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/base:ubuntu-22.04-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/bootstrap:ubuntu-22.04=oci-layout://.ci-oci-image/bootstrap_ubuntu-22-04:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/base_ubuntu-22-04'
@@ -625,6 +637,7 @@ jobs:
           name: 'docker-parent-base_ubuntu-22-04-${{ matrix.arch }}'
           path: .ci-oci-image/base_ubuntu-22-04
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   base_ubuntu-22-04_publish:
@@ -702,8 +715,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/bootstrap:sha-${{ github.sha }}-${{ matrix.arch }}-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/bootstrap:alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/bootstrap:alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -714,8 +728,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/bootstrap:sha-${{ github.sha }}-${{ matrix.arch }}-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/bootstrap:alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/bootstrap:alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
       -
@@ -750,8 +765,8 @@ jobs:
         with:
           context: docker/bootstrap/alpine
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/bootstrap:alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/bootstrap:alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/bootstrap_alpine'
@@ -763,6 +778,7 @@ jobs:
           name: 'docker-parent-bootstrap_alpine-${{ matrix.arch }}'
           path: .ci-oci-image/bootstrap_alpine
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   bootstrap_alpine_publish:
@@ -838,8 +854,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/bootstrap:sha-${{ github.sha }}-${{ matrix.arch }}-ubuntu-22.04'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/bootstrap:ubuntu-22.04-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/bootstrap:ubuntu-22.04-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -850,8 +867,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/bootstrap:sha-${{ github.sha }}-${{ matrix.arch }}-ubuntu-22.04'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/bootstrap:ubuntu-22.04-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/bootstrap:ubuntu-22.04-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
       -
@@ -886,8 +904,8 @@ jobs:
         with:
           context: docker/bootstrap/ubuntu-22.04
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/bootstrap:ubuntu-22.04-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/bootstrap:ubuntu-22.04-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/bootstrap_ubuntu-22-04'
@@ -899,6 +917,7 @@ jobs:
           name: 'docker-parent-bootstrap_ubuntu-22-04-${{ matrix.arch }}'
           path: .ci-oci-image/bootstrap_ubuntu-22-04
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   bootstrap_ubuntu-22-04_publish:
@@ -976,8 +995,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/dockerfile-build-env:sha-${{ github.sha }}-${{ matrix.arch }}-latest'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/dockerfile-build-env:latest-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/dockerfile-build-env:latest-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -988,8 +1008,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/dockerfile-build-env:sha-${{ github.sha }}-${{ matrix.arch }}-latest'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/dockerfile-build-env:latest-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/dockerfile-build-env:latest-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/base-app:ubuntu-22.04=oci-layout://.ci-oci-image/base-app_ubuntu-22-04:ci-parent-image'
       -
@@ -1077,8 +1098,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/nginx:sha-${{ github.sha }}-${{ matrix.arch }}-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/nginx:alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/nginx:alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -1089,8 +1111,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/nginx:sha-${{ github.sha }}-${{ matrix.arch }}-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/nginx:alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/nginx:alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/base:alpine=oci-layout://.ci-oci-image/base_alpine:ci-parent-image'
       -
@@ -1186,8 +1209,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache-dev:8.2-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache-dev:8.2-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -1198,8 +1222,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache-dev:8.2-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache-dev:8.2-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php-apache:8.2=oci-layout://.ci-oci-image/php-apache_8-2:ci-parent-image'
       -
@@ -1261,8 +1286,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache-dev:8.2-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache-dev:8.2-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -1273,8 +1299,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache-dev:8.2-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache-dev:8.2-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php-apache:8.2-alpine=oci-layout://.ci-oci-image/php-apache_8-2-alpine:ci-parent-image'
       -
@@ -1404,8 +1431,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache-dev:8.3-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache-dev:8.3-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -1416,8 +1444,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache-dev:8.3-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache-dev:8.3-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php-apache:8.3=oci-layout://.ci-oci-image/php-apache_8-3:ci-parent-image'
       -
@@ -1479,8 +1508,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache-dev:8.3-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache-dev:8.3-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -1491,8 +1521,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache-dev:8.3-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache-dev:8.3-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php-apache:8.3-alpine=oci-layout://.ci-oci-image/php-apache_8-3-alpine:ci-parent-image'
       -
@@ -1622,8 +1653,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache-dev:8.4-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache-dev:8.4-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -1634,8 +1666,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache-dev:8.4-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache-dev:8.4-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php-apache:8.4=oci-layout://.ci-oci-image/php-apache_8-4:ci-parent-image'
       -
@@ -1697,8 +1730,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache-dev:8.4-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache-dev:8.4-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -1709,8 +1743,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache-dev:8.4-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache-dev:8.4-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php-apache:8.4-alpine=oci-layout://.ci-oci-image/php-apache_8-4-alpine:ci-parent-image'
       -
@@ -1840,8 +1875,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache-dev:8.5-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache-dev:8.5-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -1852,8 +1888,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache-dev:8.5-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache-dev:8.5-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php-apache:8.5=oci-layout://.ci-oci-image/php-apache_8-5:ci-parent-image'
       -
@@ -1915,8 +1952,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache-dev:8.5-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache-dev:8.5-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -1927,8 +1965,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache-dev:8.5-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache-dev:8.5-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php-apache:8.5-alpine=oci-layout://.ci-oci-image/php-apache_8-5-alpine:ci-parent-image'
       -
@@ -2058,8 +2097,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.2'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.2-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.2-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -2070,8 +2110,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.2'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.2-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.2-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.2=oci-layout://.ci-oci-image/php_8-2:ci-parent-image'
       -
@@ -2101,8 +2142,8 @@ jobs:
         with:
           context: docker/php-apache/8.2
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.2-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.2-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.2=oci-layout://.ci-oci-image/php_8-2:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-apache_8-2'
@@ -2114,6 +2155,7 @@ jobs:
           name: 'docker-parent-php-apache_8-2-${{ matrix.arch }}'
           path: .ci-oci-image/php-apache_8-2
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php-apache_8-2-alpine:
@@ -2155,8 +2197,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.2-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.2-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -2167,8 +2210,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.2-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.2-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.2-alpine=oci-layout://.ci-oci-image/php_8-2-alpine:ci-parent-image'
       -
@@ -2198,8 +2242,8 @@ jobs:
         with:
           context: docker/php-apache/8.2-alpine
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.2-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.2-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.2-alpine=oci-layout://.ci-oci-image/php_8-2-alpine:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-apache_8-2-alpine'
@@ -2211,6 +2255,7 @@ jobs:
           name: 'docker-parent-php-apache_8-2-alpine-${{ matrix.arch }}'
           path: .ci-oci-image/php-apache_8-2-alpine
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php-apache_8-2-alpine_publish:
@@ -2320,8 +2365,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.3'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.3-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.3-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -2332,8 +2378,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.3'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.3-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.3-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.3=oci-layout://.ci-oci-image/php_8-3:ci-parent-image'
       -
@@ -2363,8 +2410,8 @@ jobs:
         with:
           context: docker/php-apache/8.3
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.3-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.3-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.3=oci-layout://.ci-oci-image/php_8-3:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-apache_8-3'
@@ -2376,6 +2423,7 @@ jobs:
           name: 'docker-parent-php-apache_8-3-${{ matrix.arch }}'
           path: .ci-oci-image/php-apache_8-3
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php-apache_8-3-alpine:
@@ -2417,8 +2465,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.3-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.3-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -2429,8 +2478,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.3-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.3-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.3-alpine=oci-layout://.ci-oci-image/php_8-3-alpine:ci-parent-image'
       -
@@ -2460,8 +2510,8 @@ jobs:
         with:
           context: docker/php-apache/8.3-alpine
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.3-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.3-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.3-alpine=oci-layout://.ci-oci-image/php_8-3-alpine:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-apache_8-3-alpine'
@@ -2473,6 +2523,7 @@ jobs:
           name: 'docker-parent-php-apache_8-3-alpine-${{ matrix.arch }}'
           path: .ci-oci-image/php-apache_8-3-alpine
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php-apache_8-3-alpine_publish:
@@ -2582,8 +2633,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.4'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.4-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.4-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -2594,8 +2646,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.4'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.4-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.4-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.4=oci-layout://.ci-oci-image/php_8-4:ci-parent-image'
       -
@@ -2625,8 +2678,8 @@ jobs:
         with:
           context: docker/php-apache/8.4
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.4-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.4-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.4=oci-layout://.ci-oci-image/php_8-4:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-apache_8-4'
@@ -2638,6 +2691,7 @@ jobs:
           name: 'docker-parent-php-apache_8-4-${{ matrix.arch }}'
           path: .ci-oci-image/php-apache_8-4
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php-apache_8-4-alpine:
@@ -2679,8 +2733,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.4-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.4-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -2691,8 +2746,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.4-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.4-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.4-alpine=oci-layout://.ci-oci-image/php_8-4-alpine:ci-parent-image'
       -
@@ -2722,8 +2778,8 @@ jobs:
         with:
           context: docker/php-apache/8.4-alpine
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.4-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.4-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.4-alpine=oci-layout://.ci-oci-image/php_8-4-alpine:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-apache_8-4-alpine'
@@ -2735,6 +2791,7 @@ jobs:
           name: 'docker-parent-php-apache_8-4-alpine-${{ matrix.arch }}'
           path: .ci-oci-image/php-apache_8-4-alpine
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php-apache_8-4-alpine_publish:
@@ -2844,8 +2901,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.5'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.5-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.5-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -2856,8 +2914,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.5'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.5-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.5-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.5=oci-layout://.ci-oci-image/php_8-5:ci-parent-image'
       -
@@ -2887,8 +2946,8 @@ jobs:
         with:
           context: docker/php-apache/8.5
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.5-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.5-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.5=oci-layout://.ci-oci-image/php_8-5:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-apache_8-5'
@@ -2900,6 +2959,7 @@ jobs:
           name: 'docker-parent-php-apache_8-5-${{ matrix.arch }}'
           path: .ci-oci-image/php-apache_8-5
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php-apache_8-5-alpine:
@@ -2941,8 +3001,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.5-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.5-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -2953,8 +3014,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.5-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.5-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.5-alpine=oci-layout://.ci-oci-image/php_8-5-alpine:ci-parent-image'
       -
@@ -2984,8 +3046,8 @@ jobs:
         with:
           context: docker/php-apache/8.5-alpine
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php-apache:8.5-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-apache:8.5-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.5-alpine=oci-layout://.ci-oci-image/php_8-5-alpine:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-apache_8-5-alpine'
@@ -2997,6 +3059,7 @@ jobs:
           name: 'docker-parent-php-apache_8-5-alpine-${{ matrix.arch }}'
           path: .ci-oci-image/php-apache_8-5-alpine
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php-apache_8-5-alpine_publish:
@@ -3106,8 +3169,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-dev:8.2-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-dev:8.2-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -3118,8 +3182,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-dev:8.2-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-dev:8.2-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.2=oci-layout://.ci-oci-image/php_8-2:ci-parent-image'
       -
@@ -3186,8 +3251,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-dev:8.2-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-dev:8.2-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -3198,8 +3264,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-dev:8.2-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-dev:8.2-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.2-alpine=oci-layout://.ci-oci-image/php_8-2-alpine:ci-parent-image'
       -
@@ -3334,8 +3401,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-dev:8.3-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-dev:8.3-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -3346,8 +3414,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-dev:8.3-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-dev:8.3-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.3=oci-layout://.ci-oci-image/php_8-3:ci-parent-image'
       -
@@ -3414,8 +3483,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-dev:8.3-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-dev:8.3-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -3426,8 +3496,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-dev:8.3-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-dev:8.3-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.3-alpine=oci-layout://.ci-oci-image/php_8-3-alpine:ci-parent-image'
       -
@@ -3562,8 +3633,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-dev:8.4-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-dev:8.4-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -3574,8 +3646,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-dev:8.4-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-dev:8.4-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.4=oci-layout://.ci-oci-image/php_8-4:ci-parent-image'
       -
@@ -3642,8 +3715,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-dev:8.4-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-dev:8.4-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -3654,8 +3728,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-dev:8.4-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-dev:8.4-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.4-alpine=oci-layout://.ci-oci-image/php_8-4-alpine:ci-parent-image'
       -
@@ -3790,8 +3865,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-dev:8.5-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-dev:8.5-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -3802,8 +3878,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-dev:8.5-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-dev:8.5-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.5=oci-layout://.ci-oci-image/php_8-5:ci-parent-image'
       -
@@ -3870,8 +3947,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-dev:8.5-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-dev:8.5-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -3882,8 +3960,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-dev:8.5-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-dev:8.5-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.5-alpine=oci-layout://.ci-oci-image/php_8-5-alpine:ci-parent-image'
       -
@@ -4018,8 +4097,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx-dev:8.2-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx-dev:8.2-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -4030,8 +4110,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx-dev:8.2-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx-dev:8.2-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php-nginx:8.2=oci-layout://.ci-oci-image/php-nginx_8-2:ci-parent-image'
       -
@@ -4093,8 +4174,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx-dev:8.2-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx-dev:8.2-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -4105,8 +4187,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx-dev:8.2-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx-dev:8.2-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php-nginx:8.2-alpine=oci-layout://.ci-oci-image/php-nginx_8-2-alpine:ci-parent-image'
       -
@@ -4236,8 +4319,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx-dev:8.3-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx-dev:8.3-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -4248,8 +4332,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx-dev:8.3-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx-dev:8.3-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php-nginx:8.3=oci-layout://.ci-oci-image/php-nginx_8-3:ci-parent-image'
       -
@@ -4311,8 +4396,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx-dev:8.3-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx-dev:8.3-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -4323,8 +4409,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx-dev:8.3-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx-dev:8.3-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php-nginx:8.3-alpine=oci-layout://.ci-oci-image/php-nginx_8-3-alpine:ci-parent-image'
       -
@@ -4454,8 +4541,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx-dev:8.4-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx-dev:8.4-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -4466,8 +4554,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx-dev:8.4-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx-dev:8.4-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php-nginx:8.4=oci-layout://.ci-oci-image/php-nginx_8-4:ci-parent-image'
       -
@@ -4529,8 +4618,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx-dev:8.4-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx-dev:8.4-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -4541,8 +4631,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx-dev:8.4-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx-dev:8.4-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php-nginx:8.4-alpine=oci-layout://.ci-oci-image/php-nginx_8-4-alpine:ci-parent-image'
       -
@@ -4672,8 +4763,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx-dev:8.5-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx-dev:8.5-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -4684,8 +4776,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx-dev:8.5-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx-dev:8.5-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php-nginx:8.5=oci-layout://.ci-oci-image/php-nginx_8-5:ci-parent-image'
       -
@@ -4747,8 +4840,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx-dev:8.5-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx-dev:8.5-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -4759,8 +4853,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx-dev:8.5-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx-dev:8.5-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php-nginx:8.5-alpine=oci-layout://.ci-oci-image/php-nginx_8-5-alpine:ci-parent-image'
       -
@@ -4890,8 +4985,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.2'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.2-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.2-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -4902,8 +4998,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.2'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.2-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.2-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.2=oci-layout://.ci-oci-image/php_8-2:ci-parent-image'
       -
@@ -4938,8 +5035,8 @@ jobs:
         with:
           context: docker/php-nginx/8.2
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.2-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.2-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.2=oci-layout://.ci-oci-image/php_8-2:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-nginx_8-2'
@@ -4951,6 +5048,7 @@ jobs:
           name: 'docker-parent-php-nginx_8-2-${{ matrix.arch }}'
           path: .ci-oci-image/php-nginx_8-2
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php-nginx_8-2-alpine:
@@ -4992,8 +5090,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.2-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.2-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -5004,8 +5103,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.2-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.2-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.2-alpine=oci-layout://.ci-oci-image/php_8-2-alpine:ci-parent-image'
       -
@@ -5040,8 +5140,8 @@ jobs:
         with:
           context: docker/php-nginx/8.2-alpine
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.2-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.2-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.2-alpine=oci-layout://.ci-oci-image/php_8-2-alpine:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-nginx_8-2-alpine'
@@ -5053,6 +5153,7 @@ jobs:
           name: 'docker-parent-php-nginx_8-2-alpine-${{ matrix.arch }}'
           path: .ci-oci-image/php-nginx_8-2-alpine
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php-nginx_8-2-alpine_publish:
@@ -5162,8 +5263,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.3'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.3-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.3-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -5174,8 +5276,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.3'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.3-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.3-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.3=oci-layout://.ci-oci-image/php_8-3:ci-parent-image'
       -
@@ -5210,8 +5313,8 @@ jobs:
         with:
           context: docker/php-nginx/8.3
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.3-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.3-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.3=oci-layout://.ci-oci-image/php_8-3:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-nginx_8-3'
@@ -5223,6 +5326,7 @@ jobs:
           name: 'docker-parent-php-nginx_8-3-${{ matrix.arch }}'
           path: .ci-oci-image/php-nginx_8-3
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php-nginx_8-3-alpine:
@@ -5264,8 +5368,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.3-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.3-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -5276,8 +5381,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.3-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.3-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.3-alpine=oci-layout://.ci-oci-image/php_8-3-alpine:ci-parent-image'
       -
@@ -5312,8 +5418,8 @@ jobs:
         with:
           context: docker/php-nginx/8.3-alpine
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.3-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.3-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.3-alpine=oci-layout://.ci-oci-image/php_8-3-alpine:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-nginx_8-3-alpine'
@@ -5325,6 +5431,7 @@ jobs:
           name: 'docker-parent-php-nginx_8-3-alpine-${{ matrix.arch }}'
           path: .ci-oci-image/php-nginx_8-3-alpine
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php-nginx_8-3-alpine_publish:
@@ -5434,8 +5541,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.4'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.4-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.4-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -5446,8 +5554,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.4'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.4-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.4-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.4=oci-layout://.ci-oci-image/php_8-4:ci-parent-image'
       -
@@ -5482,8 +5591,8 @@ jobs:
         with:
           context: docker/php-nginx/8.4
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.4-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.4-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.4=oci-layout://.ci-oci-image/php_8-4:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-nginx_8-4'
@@ -5495,6 +5604,7 @@ jobs:
           name: 'docker-parent-php-nginx_8-4-${{ matrix.arch }}'
           path: .ci-oci-image/php-nginx_8-4
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php-nginx_8-4-alpine:
@@ -5536,8 +5646,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.4-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.4-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -5548,8 +5659,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.4-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.4-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.4-alpine=oci-layout://.ci-oci-image/php_8-4-alpine:ci-parent-image'
       -
@@ -5584,8 +5696,8 @@ jobs:
         with:
           context: docker/php-nginx/8.4-alpine
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.4-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.4-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.4-alpine=oci-layout://.ci-oci-image/php_8-4-alpine:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-nginx_8-4-alpine'
@@ -5597,6 +5709,7 @@ jobs:
           name: 'docker-parent-php-nginx_8-4-alpine-${{ matrix.arch }}'
           path: .ci-oci-image/php-nginx_8-4-alpine
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php-nginx_8-4-alpine_publish:
@@ -5706,8 +5819,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.5'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.5-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.5-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -5718,8 +5832,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.5'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.5-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.5-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.5=oci-layout://.ci-oci-image/php_8-5:ci-parent-image'
       -
@@ -5754,8 +5869,8 @@ jobs:
         with:
           context: docker/php-nginx/8.5
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.5-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.5-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.5=oci-layout://.ci-oci-image/php_8-5:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-nginx_8-5'
@@ -5767,6 +5882,7 @@ jobs:
           name: 'docker-parent-php-nginx_8-5-${{ matrix.arch }}'
           path: .ci-oci-image/php-nginx_8-5
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php-nginx_8-5-alpine:
@@ -5808,8 +5924,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.5-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.5-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -5820,8 +5937,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.5-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.5-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.5-alpine=oci-layout://.ci-oci-image/php_8-5-alpine:ci-parent-image'
       -
@@ -5856,8 +5974,8 @@ jobs:
         with:
           context: docker/php-nginx/8.5-alpine
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php-nginx:8.5-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php-nginx:8.5-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/php:8.5-alpine=oci-layout://.ci-oci-image/php_8-5-alpine:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-nginx_8-5-alpine'
@@ -5869,6 +5987,7 @@ jobs:
           name: 'docker-parent-php-nginx_8-5-alpine-${{ matrix.arch }}'
           path: .ci-oci-image/php-nginx_8-5-alpine
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php-nginx_8-5-alpine_publish:
@@ -5978,8 +6097,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.2'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php:8.2-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.2-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -5990,8 +6110,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.2'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php:8.2-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.2-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
       -
@@ -6026,8 +6147,8 @@ jobs:
         with:
           context: docker/php-official/8.2
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php:8.2-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.2-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php_8-2'
@@ -6039,6 +6160,7 @@ jobs:
           name: 'docker-parent-php_8-2-${{ matrix.arch }}'
           path: .ci-oci-image/php_8-2
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php_8-2-alpine:
@@ -6080,8 +6202,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php:8.2-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.2-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -6092,8 +6215,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php:8.2-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.2-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
       -
@@ -6128,8 +6252,8 @@ jobs:
         with:
           context: docker/php-official/8.2-alpine
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php:8.2-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.2-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php_8-2-alpine'
@@ -6141,6 +6265,7 @@ jobs:
           name: 'docker-parent-php_8-2-alpine-${{ matrix.arch }}'
           path: .ci-oci-image/php_8-2-alpine
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php_8-2-alpine_publish:
@@ -6254,8 +6379,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.3'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php:8.3-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.3-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -6266,8 +6392,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.3'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php:8.3-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.3-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
       -
@@ -6302,8 +6429,8 @@ jobs:
         with:
           context: docker/php-official/8.3
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php:8.3-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.3-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php_8-3'
@@ -6315,6 +6442,7 @@ jobs:
           name: 'docker-parent-php_8-3-${{ matrix.arch }}'
           path: .ci-oci-image/php_8-3
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php_8-3-alpine:
@@ -6356,8 +6484,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php:8.3-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.3-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -6368,8 +6497,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php:8.3-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.3-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
       -
@@ -6404,8 +6534,8 @@ jobs:
         with:
           context: docker/php-official/8.3-alpine
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php:8.3-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.3-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php_8-3-alpine'
@@ -6417,6 +6547,7 @@ jobs:
           name: 'docker-parent-php_8-3-alpine-${{ matrix.arch }}'
           path: .ci-oci-image/php_8-3-alpine
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php_8-3-alpine_publish:
@@ -6530,8 +6661,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.4'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php:8.4-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.4-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -6542,8 +6674,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.4'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php:8.4-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.4-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
       -
@@ -6578,8 +6711,8 @@ jobs:
         with:
           context: docker/php-official/8.4
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php:8.4-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.4-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php_8-4'
@@ -6591,6 +6724,7 @@ jobs:
           name: 'docker-parent-php_8-4-${{ matrix.arch }}'
           path: .ci-oci-image/php_8-4
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php_8-4-alpine:
@@ -6632,8 +6766,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php:8.4-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.4-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -6644,8 +6779,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php:8.4-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.4-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
       -
@@ -6680,8 +6816,8 @@ jobs:
         with:
           context: docker/php-official/8.4-alpine
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php:8.4-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.4-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php_8-4-alpine'
@@ -6693,6 +6829,7 @@ jobs:
           name: 'docker-parent-php_8-4-alpine-${{ matrix.arch }}'
           path: .ci-oci-image/php_8-4-alpine
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php_8-4-alpine_publish:
@@ -6806,8 +6943,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.5'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php:8.5-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.5-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -6818,8 +6956,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.5'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php:8.5-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.5-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
       -
@@ -6854,8 +6993,8 @@ jobs:
         with:
           context: docker/php-official/8.5
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php:8.5-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.5-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php_8-5'
@@ -6867,6 +7006,7 @@ jobs:
           name: 'docker-parent-php_8-5-${{ matrix.arch }}'
           path: .ci-oci-image/php_8-5
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php_8-5-alpine:
@@ -6908,8 +7048,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php:8.5-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.5-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -6920,8 +7061,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/php:8.5-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.5-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
       -
@@ -6956,8 +7098,8 @@ jobs:
         with:
           context: docker/php-official/8.5-alpine
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/php:8.5-alpine-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/php:8.5-alpine-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php_8-5-alpine'
@@ -6969,6 +7111,7 @@ jobs:
           name: 'docker-parent-php_8-5-alpine-${{ matrix.arch }}'
           path: .ci-oci-image/php_8-5-alpine
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   php_8-5-alpine_publish:
@@ -7074,8 +7217,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/storage:sha-${{ github.sha }}-${{ matrix.arch }}-latest'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/storage:latest-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/storage:latest-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         if: "${{github.ref == 'refs/heads/master'}}"
@@ -7154,8 +7298,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/toolbox:sha-${{ github.sha }}-${{ matrix.arch }}-latest'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/toolbox:latest-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/toolbox:latest-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         if: "${{github.ref == 'refs/heads/master'}}"
@@ -7176,8 +7321,8 @@ jobs:
         with:
           context: docker/toolbox/latest
           platforms: '${{ matrix.platform }}'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          cache-from: 'type=gha,scope=webdevops/toolbox:latest-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/toolbox:latest-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/toolbox_latest'
       -
@@ -7188,6 +7333,7 @@ jobs:
           name: 'docker-parent-toolbox_latest-${{ matrix.arch }}'
           path: .ci-oci-image/toolbox_latest
           retention-days: 1
+          overwrite: true
           compression-level: 0
           if-no-files-found: error
   toolbox_latest_publish:
@@ -7263,8 +7409,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/vsftp:sha-${{ github.sha }}-${{ matrix.arch }}-latest'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/vsftp:latest-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/vsftp:latest-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
       -
         name: 'Build (load locally, from parent artifact)'
@@ -7275,8 +7422,9 @@ jobs:
           platforms: '${{ matrix.platform }}'
           load: true
           tags: 'ghcr.io/webdevops/vsftp:sha-${{ github.sha }}-${{ matrix.arch }}-latest'
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
+          no-cache: "${{ github.event_name == 'schedule' || github.run_attempt > 1 }}"
+          cache-from: 'type=gha,scope=webdevops/vsftp:latest-${{ matrix.arch }}'
+          cache-to: 'type=gha,scope=webdevops/vsftp:latest-${{ matrix.arch }},mode=max'
           build-args: 'TARGETARCH=${{ matrix.arch }}'
           build-contexts: 'webdevops/base:latest=oci-layout://.ci-oci-image/base_ubuntu-22-04:ci-parent-image'
       -
diff --git a/ci/src/GithubJobBuilder.php b/ci/src/GithubJobBuilder.php
index 773ba5b70..1e1660f40 100644
--- a/ci/src/GithubJobBuilder.php
+++ b/ci/src/GithubJobBuilder.php
@@ -113,12 +113,12 @@ public function getJobsDescription(array $node): array
                                 'name' => 'Export image (OCI layout)',
                                 'if' => '${{ github.ref != \'refs/heads/master\' }}',
                                 'uses' => 'docker/build-push-action@v6',
+                                // Reuse the tested local build, including on no-cache reruns.
                                 'with' => array_merge(
                                     [
                                         'context' => dirname(str_replace(__DIR__ . '/../../', '', $node['file'])),
                                         'platforms' => '${{ matrix.platform }}',
-                                        'cache-from' => 'type=gha',
-                                        'cache-to' => 'type=gha,mode=max',
+                                        ...$this->buildCacheWith($node),
                                         'build-args' => implode("\n", [
                                             'TARGETARCH=${{ matrix.arch }}',
                                         ]),
@@ -140,6 +140,8 @@ public function getJobsDescription(array $node): array
                                     'name' => $this->getCiImageArtifactName($node['id']),
                                     'path' => $this->getCiImagePath($node['id']),
                                     'retention-days' => 1,
+                                    // A rerun must replace the previous attempt's parent image.
+                                    'overwrite' => true,
                                     'compression-level' => 0,
                                     'if-no-files-found' => 'error',
                                 ],
@@ -215,14 +217,26 @@ private function buildPushWith(array $node): array
             'platforms' => '${{ matrix.platform }}',
             'load' => true,
             'tags' => 'ghcr.io/webdevops/' . $node['image'] . ':sha-${{ github.sha }}-${{ matrix.arch }}-' . $node['tag'],
-            'cache-from' => 'type=gha',
-            'cache-to' => 'type=gha,mode=max',
+            // Re-run all jobs to test a fresh build of the full image chain.
+            'no-cache' => '${{ github.event_name == \'schedule\' || github.run_attempt > 1 }}',
+            ...$this->buildCacheWith($node),
             'build-args' => implode("\n", [
                 'TARGETARCH=${{ matrix.arch }}',
             ]),
         ];
     }
 
+    private function buildCacheWith(array $node): array
+    {
+        // Full image/tag and architecture keep scopes unique and reusable
+        // across commits, branches and reruns.
+        $cache = 'type=gha,scope=' . $node['id'] . '-${{ matrix.arch }}';
+        return [
+            'cache-from' => $cache,
+            'cache-to' => $cache . ',mode=max',
+        ];
+    }
+
     /**
      * All internal webdevops/* images this node needs a same-run OCI
      * artifact override for: its real FROM parent (if any) plus any images
diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile
index 1ecb93e5f..6e63c33c6 100644
--- a/docker/php-official/8.2-alpine/Dockerfile
+++ b/docker/php-official/8.2-alpine/Dockerfile
@@ -144,7 +144,7 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin
     && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \
     # Install new version of ICU
     && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
-    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
+    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make -j"$(nproc)" && make install && cd / && rm -rf /tmp/icu* \
     # Install extensions
     && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
     && docker-php-ext-configure gd --with-avif --with-jpeg --with-freetype --with-webp \
@@ -154,7 +154,7 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin
     && docker-php-ext-configure ldap \
     && docker-php-ext-configure ftp --with-openssl-dir \
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
-    && docker-php-ext-install \
+    && docker-php-ext-install -j"$(nproc)" \
         bcmath \
         bz2 \
         calendar \
diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile
index 09d317056..ee99c23bc 100644
--- a/docker/php-official/8.2/Dockerfile
+++ b/docker/php-official/8.2/Dockerfile
@@ -143,7 +143,7 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin
     && rm -rf master.zip guetzli-master \
     # Install new version of ICU
     && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
-    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
+    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make -j"$(nproc)" && make install && cd / && rm -rf /tmp/icu* \
     # Install extensions
     && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
     && docker-php-ext-configure gd --with-avif --with-jpeg --with-freetype --with-webp \
@@ -153,7 +153,7 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin
     && docker-php-ext-configure ldap \
     && docker-php-ext-configure ftp --with-openssl-dir \
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
-    && docker-php-ext-install \
+    && docker-php-ext-install -j"$(nproc)" \
         bcmath \
         amqp \
         imagick \
diff --git a/docker/php-official/8.3-alpine/Dockerfile b/docker/php-official/8.3-alpine/Dockerfile
index 9af74abe0..7671ad2bb 100644
--- a/docker/php-official/8.3-alpine/Dockerfile
+++ b/docker/php-official/8.3-alpine/Dockerfile
@@ -144,7 +144,7 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin
     && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \
     # Install new version of ICU
     && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
-    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
+    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make -j"$(nproc)" && make install && cd / && rm -rf /tmp/icu* \
     # Install extensions
     && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
     && docker-php-ext-configure gd --with-avif --with-jpeg --with-freetype --with-webp \
@@ -154,7 +154,7 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin
     && docker-php-ext-configure ldap \
     && docker-php-ext-configure ftp --with-openssl-dir \
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
-    && docker-php-ext-install \
+    && docker-php-ext-install -j"$(nproc)" \
         bcmath \
         bz2 \
         calendar \
diff --git a/docker/php-official/8.3/Dockerfile b/docker/php-official/8.3/Dockerfile
index cce96ef44..dce9702ed 100644
--- a/docker/php-official/8.3/Dockerfile
+++ b/docker/php-official/8.3/Dockerfile
@@ -143,7 +143,7 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin
     && rm -rf master.zip guetzli-master \
     # Install new version of ICU
     && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
-    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
+    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make -j"$(nproc)" && make install && cd / && rm -rf /tmp/icu* \
     # Install extensions
     && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
     && docker-php-ext-configure gd --with-avif --with-jpeg --with-freetype --with-webp \
@@ -153,7 +153,7 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin
     && docker-php-ext-configure ldap \
     && docker-php-ext-configure ftp --with-openssl-dir \
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
-    && docker-php-ext-install \
+    && docker-php-ext-install -j"$(nproc)" \
         bcmath \
         amqp \
         imagick \
diff --git a/docker/php-official/8.4-alpine/Dockerfile b/docker/php-official/8.4-alpine/Dockerfile
index 9bd9c430c..e7c866566 100644
--- a/docker/php-official/8.4-alpine/Dockerfile
+++ b/docker/php-official/8.4-alpine/Dockerfile
@@ -144,7 +144,7 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin
     && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \
     # Install new version of ICU
     && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
-    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
+    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make -j"$(nproc)" && make install && cd / && rm -rf /tmp/icu* \
     # Install extensions
     && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
     && docker-php-ext-configure gd --with-avif --with-jpeg --with-freetype --with-webp \
@@ -153,7 +153,7 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && docker-php-ext-configure ldap \
     && docker-php-ext-configure ftp --with-ftp-ssl \
-    && docker-php-ext-install \
+    && docker-php-ext-install -j"$(nproc)" \
         bcmath \
         bz2 \
         calendar \
diff --git a/docker/php-official/8.4/Dockerfile b/docker/php-official/8.4/Dockerfile
index e94c6c231..fa9d30d0e 100644
--- a/docker/php-official/8.4/Dockerfile
+++ b/docker/php-official/8.4/Dockerfile
@@ -142,7 +142,7 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin
     && rm -rf master.zip guetzli-master \
     # Install new version of ICU
     && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
-    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
+    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make -j"$(nproc)" && make install && cd / && rm -rf /tmp/icu* \
     # Install extensions
     && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
     && docker-php-ext-configure gd --with-avif --with-jpeg --with-freetype --with-webp \
@@ -151,7 +151,7 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin
     && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
     && docker-php-ext-configure ldap \
     && docker-php-ext-configure ftp --with-ftp-ssl \
-    && docker-php-ext-install \
+    && docker-php-ext-install -j"$(nproc)" \
         bcmath \
         amqp \
         imagick \
diff --git a/docker/php-official/8.5-alpine/Dockerfile b/docker/php-official/8.5-alpine/Dockerfile
index daff42a25..2eded84c6 100644
--- a/docker/php-official/8.5-alpine/Dockerfile
+++ b/docker/php-official/8.5-alpine/Dockerfile
@@ -144,7 +144,7 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin
     && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \
     # Install new version of ICU
     && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
-    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
+    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make -j"$(nproc)" && make install && cd / && rm -rf /tmp/icu* \
     # Install extensions
     && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
     && docker-php-ext-configure gd --with-avif --with-jpeg --with-freetype --with-webp \
@@ -153,7 +153,7 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && docker-php-ext-configure ldap \
     && docker-php-ext-configure ftp --with-ftp-ssl \
-    && docker-php-ext-install \
+    && docker-php-ext-install -j"$(nproc)" \
         bcmath \
         bz2 \
         calendar \
diff --git a/docker/php-official/8.5/Dockerfile b/docker/php-official/8.5/Dockerfile
index dd74475ca..e6f993e38 100644
--- a/docker/php-official/8.5/Dockerfile
+++ b/docker/php-official/8.5/Dockerfile
@@ -142,7 +142,7 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin
     && rm -rf master.zip guetzli-master \
     # Install new version of ICU
     && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
-    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
+    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make -j"$(nproc)" && make install && cd / && rm -rf /tmp/icu* \
     # Install extensions
     && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
     && docker-php-ext-configure gd --with-avif --with-jpeg --with-freetype --with-webp \
@@ -151,7 +151,7 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin
     && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
     && docker-php-ext-configure ldap \
     && docker-php-ext-configure ftp --with-ftp-ssl \
-    && docker-php-ext-install \
+    && docker-php-ext-install -j"$(nproc)" \
         bcmath \
         amqp \
         imagick \
diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2
index 0e05c114c..48c00e83f 100644
--- a/template/Dockerfile/images/php.jinja2
+++ b/template/Dockerfile/images/php.jinja2
@@ -107,7 +107,7 @@
     && rm -rf master.zip guetzli-master \
     # Install new version of ICU
     && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
-    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
+    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make -j"$(nproc)" && make install && cd / && rm -rf /tmp/icu* \
     # Install extensions
     && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
     && docker-php-ext-configure gd --with-avif --with-jpeg --with-freetype --with-webp \
@@ -123,7 +123,7 @@
 {%- if version != '8.4' and version != '8.5' %}
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
 {%- endif %}
-    && docker-php-ext-install \
+    && docker-php-ext-install -j"$(nproc)" \
         bcmath \
         amqp \
         imagick \
@@ -261,7 +261,7 @@
     && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \
     # Install new version of ICU
     && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
-    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
+    && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make -j"$(nproc)" && make install && cd / && rm -rf /tmp/icu* \
     # Install extensions
     && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
     && docker-php-ext-configure gd --with-avif --with-jpeg --with-freetype --with-webp \
@@ -277,7 +277,7 @@
 {%- if version != '8.4' and version != '8.5' %}
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
 {%- endif %}
-    && docker-php-ext-install \
+    && docker-php-ext-install -j"$(nproc)" \
         bcmath \
         bz2 \
         calendar \