diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index a3b3119..a52aaca 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -16,6 +16,9 @@ jobs:
   legacy-php:
     name: Build Legacy PHP Images
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php_version: [ "7.4", "8.0", "8.1" ]
     steps:
       - uses: actions/checkout@v3
       - uses: docker/setup-qemu-action@v2
@@ -29,7 +32,7 @@ jobs:
         env:
           PRE_AUTH: 1
           IMAGE_NAME: ghcr.io/wardenenv/centos-php
-          VERSION_LIST: 7.4 8.0
+          VERSION_LIST: ${{ matrix.php_version }}
           VARIANT_LIST: cli cli-loaders fpm fpm-loaders
           PUSH_FLAG: 1
           INDEV_FLAG: ${{ github.ref == 'refs/heads/main' && '0' || '1' }}
@@ -37,6 +40,9 @@ jobs:
   php:
     name: Build PHP Images
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php_version: ["8.2", "8.3", "8.4"]
     steps:
       - uses: actions/checkout@v3
       - uses: docker/setup-qemu-action@v2
@@ -50,7 +56,7 @@ jobs:
         env:
           PRE_AUTH: 1
           IMAGE_NAME: ghcr.io/wardenenv/centos-php
-          VERSION_LIST: 8.1 8.2 8.3 8.4
+          VERSION_LIST: ${{ matrix.php_version }}
           VARIANT_LIST: cli cli-loaders fpm fpm-loaders
           PUSH_FLAG: 1
           INDEV_FLAG: ${{ github.ref == 'refs/heads/main' && '0' || '1' }}
diff --git a/php/cli/Dockerfile b/php/cli/Dockerfile
index 438df27..a28e0f2 100644
--- a/php/cli/Dockerfile
+++ b/php/cli/Dockerfile
@@ -18,6 +18,7 @@ RUN set -eux \
     && PHP_PACKAGES= && for PKG in ${PHP_EXTENSIONS}; do \
         if [[ ${PKG} = "mcrypt" ]] && (( ${PHP_VERSION} > 71 )); then continue; fi; \
         if [[ ${PKG} = "sodium" ]] && (( ${PHP_VERSION} < 72 )); then continue; fi; \
+        if [[ ${PKG} = "xmlrpc" ]] && (( ${PHP_VERSION} > 83 )); then continue; fi; \
         PHP_PACKAGES+="php-${PKG} "; \
     done \
     && dnf install -y ${PHP_PACKAGES} git perl which npm patch gettext unzip bzip2 pwgen procps nmap-ncat jq \