diff --git a/.github/workflows/publish.5.yml b/.github/workflows/publish.5.yml
index 19bff6b..c208a0a 100644
--- a/.github/workflows/publish.5.yml
+++ b/.github/workflows/publish.5.yml
@@ -59,12 +59,12 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           platforms: linux/amd64
-          cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
+#          cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
           cache-to: type=inline
           context: .
           file: ${{ ((contains(matrix.flavor, 'alpine') || matrix.version == 'alpine') && 'Dockerfile.alpine') || 'Dockerfile' }}
           build-args: |
-            BASE_IMAGE=chialab/php:${{ matrix.version }}${{ matrix.flavor }}
+            BASE_IMAGE=php:${{ matrix.version }}${{ matrix.flavor }}
           tags: |
             chialab/php:${{ matrix.version }}${{ matrix.flavor }}
             ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
diff --git a/.github/workflows/publish.7.yml b/.github/workflows/publish.7.yml
index c67fb86..cdbbd69 100644
--- a/.github/workflows/publish.7.yml
+++ b/.github/workflows/publish.7.yml
@@ -59,12 +59,12 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           platforms: linux/amd64,linux/arm64
-          cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
+#          cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
           cache-to: type=inline
           context: .
           file: ${{ ((contains(matrix.flavor, 'alpine') || matrix.version == 'alpine') && 'Dockerfile.alpine') || 'Dockerfile' }}
           build-args: |
-            BASE_IMAGE=chialab/php:${{ matrix.version }}${{ matrix.flavor }}
+            BASE_IMAGE=php:${{ matrix.version }}${{ matrix.flavor }}
           tags: |
             chialab/php:${{ matrix.version }}${{ matrix.flavor }}
             ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
diff --git a/.github/workflows/publish.8.yml b/.github/workflows/publish.8.yml
index 7198ade..f0b96f8 100644
--- a/.github/workflows/publish.8.yml
+++ b/.github/workflows/publish.8.yml
@@ -54,12 +54,12 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           platforms: linux/amd64,linux/arm64
-          cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
+#          cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
           cache-to: type=inline
           context: .
           file: ${{ ((contains(matrix.flavor, 'alpine') || matrix.version == 'alpine') && 'Dockerfile.alpine') || 'Dockerfile' }}
           build-args: |
-            BASE_IMAGE=chialab/php:${{ matrix.version }}${{ matrix.flavor }}
+            BASE_IMAGE=php:${{ matrix.version }}${{ matrix.flavor }}
           tags: |
             chialab/php:${{ matrix.version }}${{ matrix.flavor }}
             ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
diff --git a/.github/workflows/publish.compat.yml b/.github/workflows/publish.compat.yml
index 03f38c7..10468eb 100644
--- a/.github/workflows/publish.compat.yml
+++ b/.github/workflows/publish.compat.yml
@@ -55,7 +55,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           platforms: linux/amd64
-          cache-from: type=registry,ref=ghcr.io/chialab/php-compat:${{ matrix.version }}${{ matrix.flavor }}
+#          cache-from: type=registry,ref=ghcr.io/chialab/php-compat:${{ matrix.version }}${{ matrix.flavor }}
           cache-to: type=inline
           context: ./compat
           file: ${{ format('compat/{0}.{1}{2}', 'Dockerfile', matrix.version, matrix.flavor) }}
diff --git a/.github/workflows/publish.latest.yml b/.github/workflows/publish.latest.yml
index 2079f95..2cddb54 100644
--- a/.github/workflows/publish.latest.yml
+++ b/.github/workflows/publish.latest.yml
@@ -53,12 +53,12 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           platforms: linux/amd64,linux/arm64
-          cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}
+#          cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}
           cache-to: type=inline
           context: .
           file: ${{ ((contains(matrix.flavor, 'alpine') || matrix.version == 'alpine') && 'Dockerfile.alpine') || 'Dockerfile' }}
           build-args: |
-            BASE_IMAGE=chialab/php:${{ matrix.version }}
+            BASE_IMAGE=php:${{ matrix.version }}
           tags: |
             chialab/php:${{ matrix.version }}
             ghcr.io/chialab/php:${{ matrix.version }}
diff --git a/.github/workflows/test.5.yml b/.github/workflows/test.5.yml
index a943037..99db370 100644
--- a/.github/workflows/test.5.yml
+++ b/.github/workflows/test.5.yml
@@ -41,12 +41,12 @@ jobs:
       - name: Build image for testing
         uses: docker/build-push-action@v5
         with:
-          cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
+#          cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
           cache-to: type=inline
           context: .
           file: ${{ ((contains(matrix.flavor, 'alpine') || matrix.version == 'alpine') && 'Dockerfile.alpine') || 'Dockerfile' }}
           build-args: |
-            BASE_IMAGE=chialab/php:${{ matrix.version }}${{ matrix.flavor }}
+            BASE_IMAGE=php:${{ matrix.version }}${{ matrix.flavor }}
           tags: localhost:5000/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
           push: true
 
diff --git a/.github/workflows/test.7.yml b/.github/workflows/test.7.yml
index 14f8957..39ed282 100644
--- a/.github/workflows/test.7.yml
+++ b/.github/workflows/test.7.yml
@@ -41,12 +41,12 @@ jobs:
       - name: Build image for testing
         uses: docker/build-push-action@v5
         with:
-          cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
+#          cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
           cache-to: type=inline
           context: .
           file: ${{ ((contains(matrix.flavor, 'alpine') || matrix.version == 'alpine') && 'Dockerfile.alpine') || 'Dockerfile' }}
           build-args: |
-            BASE_IMAGE=chialab/php:${{ matrix.version }}${{ matrix.flavor }}
+            BASE_IMAGE=php:${{ matrix.version }}${{ matrix.flavor }}
           tags: localhost:5000/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
           push: true
 
diff --git a/.github/workflows/test.8.yml b/.github/workflows/test.8.yml
index 667a636..fd78412 100644
--- a/.github/workflows/test.8.yml
+++ b/.github/workflows/test.8.yml
@@ -36,12 +36,12 @@ jobs:
       - name: Build image for testing
         uses: docker/build-push-action@v5
         with:
-          cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
+#          cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
           cache-to: type=inline
           context: .
           file: ${{ ((contains(matrix.flavor, 'alpine') || matrix.version == 'alpine') && 'Dockerfile.alpine') || 'Dockerfile' }}
           build-args: |
-            BASE_IMAGE=chialab/php:${{ matrix.version }}${{ matrix.flavor }}
+            BASE_IMAGE=php:${{ matrix.version }}${{ matrix.flavor }}
           tags: localhost:5000/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
           push: true
 
diff --git a/.github/workflows/test.compat.yml b/.github/workflows/test.compat.yml
index 44e1d6d..2b15cc4 100644
--- a/.github/workflows/test.compat.yml
+++ b/.github/workflows/test.compat.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Build image for testing
         uses: docker/build-push-action@v5
         with:
-          cache-from: type=registry,ref=ghcr.io/chialab/php-compat:${{ matrix.version }}${{ matrix.flavor }}
+#          cache-from: type=registry,ref=ghcr.io/chialab/php-compat:${{ matrix.version }}${{ matrix.flavor }}
           cache-to: type=inline
           context: ./compat
           file: ${{ format('compat/{0}.{1}{2}', 'Dockerfile', matrix.version, matrix.flavor) }}
diff --git a/.github/workflows/test.latest.yml b/.github/workflows/test.latest.yml
index 08cac1a..ee1f545 100644
--- a/.github/workflows/test.latest.yml
+++ b/.github/workflows/test.latest.yml
@@ -35,12 +35,12 @@ jobs:
       - name: Build image for testing
         uses: docker/build-push-action@v5
         with:
-          cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}
+#          cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}
           cache-to: type=inline
           context: .
           file: ${{ ((contains(matrix.flavor, 'alpine') || matrix.version == 'alpine') && 'Dockerfile.alpine') || 'Dockerfile' }}
           build-args: |
-            BASE_IMAGE=chialab/php:${{ matrix.version }}
+            BASE_IMAGE=php:${{ matrix.version }}
           tags: localhost:5000/chialab/php:${{ matrix.version }}
           push: true