diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index 67ebd33..3a2cf1e 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -46,10 +46,10 @@ jobs:
       matrix:
         version:
           - '8.1.34'
-          - '8.2.31'
-          - '8.3.31'
-          - '8.4.22'
-          - '8.5.7'
+          - '8.2.32'
+          - '8.3.32'
+          - '8.4.23'
+          - '8.5.8'
         os:
           - alpine
           - debian
@@ -79,10 +79,10 @@ jobs:
           - apache
         version:
           - '8.1.34'
-          - '8.2.31'
-          - '8.3.31'
-          - '8.4.22'
-          - '8.5.7'
+          - '8.2.32'
+          - '8.3.32'
+          - '8.4.23'
+          - '8.5.8'
         exclude:
           - variant: apache
             os: alpine
@@ -92,7 +92,7 @@ jobs:
       version: ${{ matrix.version }}
       os: ${{ matrix.os }}
       variant: ${{ matrix.variant }}
-      latest: '8.5.7'
+      latest: '8.5.8'
       base_image_registry: ${{ github.event.inputs.base_image_registry || 'docker.io' }}
   build-complete:
     needs: [base-images, build-images, cleanup-cache]
diff --git a/builder/alpine/Dockerfile-build b/builder/alpine/Dockerfile-build
index 787bcdf..fb14408 100644
--- a/builder/alpine/Dockerfile-build
+++ b/builder/alpine/Dockerfile-build
@@ -72,7 +72,8 @@ RUN --mount=type=cache,target=/tmp/pear,sharing=locked \
         pdo_mysql \
         pdo_sqlite \
         sockets \
-        xsl; \
+        xsl \
+        zip; \
     \
 # Install PHP extensions from source using PECL \
     pecl install --onlyreqdeps --nobuild igbinary; \
@@ -122,7 +123,6 @@ RUN --mount=type=cache,target=/tmp/pear,sharing=locked \
     if [ "$PHP_ZTS" -eq 1 ]; then pie install --skip-enable-extension pecl/parallel; fi && \
     pie install --skip-enable-extension pecl/pcov  && \
     pie install --skip-enable-extension pecl/timezonedb  && \
-    pie install --skip-enable-extension pecl/zip  && \
     pie install --skip-enable-extension php-memcached/php-memcached --enable-memcached-json --enable-memcached-igbinary --enable-memcached-msgpack  && \
     pie install --skip-enable-extension phpredis/phpredis --enable-redis-igbinary --enable-redis-msgpack  && \
     pie install --skip-enable-extension supermetrics/jsonpath && \
@@ -145,8 +145,7 @@ RUN PHP_ZTS="$(php -r 'echo PHP_ZTS;')"; \
       redis \
       swoole \
       timezonedb \
-      xdebug \
-      zip || { echo "Could not enable some extensions"; exit 1; }; \
+      xdebug || { echo "Could not enable some extensions"; exit 1; }; \
     \
 # check all installed extensions \
     pie show --all;
\ No newline at end of file
diff --git a/builder/debian/Dockerfile-build b/builder/debian/Dockerfile-build
index 0f50f4f..83a1981 100644
--- a/builder/debian/Dockerfile-build
+++ b/builder/debian/Dockerfile-build
@@ -80,7 +80,8 @@ RUN --mount=type=cache,target=/tmp/pear,sharing=locked \
         pdo_mysql \
         pdo_sqlite \
         sockets \
-        xsl; \
+        xsl \
+        zip; \
     \
 # Install PHP extensions from source using PECL \
     pecl install --onlyreqdeps --nobuild igbinary; \
@@ -130,7 +131,6 @@ RUN --mount=type=cache,target=/tmp/pear,sharing=locked \
     if [ "$PHP_ZTS" -eq 1 ]; then pie install --skip-enable-extension pecl/parallel; fi && \
     pie install --skip-enable-extension pecl/pcov  && \
     pie install --skip-enable-extension pecl/timezonedb  && \
-    pie install --skip-enable-extension pecl/zip  && \
     pie install --skip-enable-extension php-memcached/php-memcached --enable-memcached-json --enable-memcached-igbinary --enable-memcached-msgpack  && \
     pie install --skip-enable-extension phpredis/phpredis --enable-redis-igbinary --enable-redis-msgpack  && \
     pie install --skip-enable-extension supermetrics/jsonpath && \
@@ -153,8 +153,7 @@ RUN PHP_ZTS="$(php -r 'echo PHP_ZTS;')"; \
       redis \
       swoole \
       timezonedb \
-      xdebug \
-      zip || { echo "Could not enable some extensions"; exit 1; }; \
+      xdebug || { echo "Could not enable some extensions"; exit 1; }; \
     \
 # check all installed extensions \
     pie show --all;
\ No newline at end of file