diff --git a/.github/workflows/githubactions-php-apache.yml b/.github/workflows/githubactions-php-apache.yml
index 479dec3..e397448 100644
--- a/.github/workflows/githubactions-php-apache.yml
+++ b/.github/workflows/githubactions-php-apache.yml
@@ -23,6 +23,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - {base-image: "php:7.4-apache-bullseye", php-version: "7.4"}
+          - {base-image: "php:8.0-apache-bullseye", php-version: "8.0"}
           - {base-image: "php:8.1-apache-trixie", php-version: "8.1"}
           - {base-image: "php:8.2-apache-trixie", php-version: "8.2"}
           - {base-image: "php:8.3-apache-trixie", php-version: "8.3"}
diff --git a/.github/workflows/githubactions-php-coverage.yml b/.github/workflows/githubactions-php-coverage.yml
index d56547c..3cdc5a8 100644
--- a/.github/workflows/githubactions-php-coverage.yml
+++ b/.github/workflows/githubactions-php-coverage.yml
@@ -23,6 +23,8 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
+          - "7.4"
+          - "8.0"
           - "8.1"
           - "8.2"
           - "8.3"
diff --git a/.github/workflows/githubactions-php.yml b/.github/workflows/githubactions-php.yml
index 202b83d..1a7c285 100644
--- a/.github/workflows/githubactions-php.yml
+++ b/.github/workflows/githubactions-php.yml
@@ -23,6 +23,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - {base-image: "php:7.4-fpm-bullseye", php-version: "7.4"}
+          - {base-image: "php:8.0-fpm-bullseye", php-version: "8.0"}
           - {base-image: "php:8.1-fpm-trixie", php-version: "8.1"}
           - {base-image: "php:8.2-fpm-trixie", php-version: "8.2"}
           - {base-image: "php:8.3-fpm-trixie", php-version: "8.3"}
diff --git a/githubactions-php-apache/Dockerfile b/githubactions-php-apache/Dockerfile
index ab060b3..512fb5d 100644
--- a/githubactions-php-apache/Dockerfile
+++ b/githubactions-php-apache/Dockerfile
@@ -18,8 +18,11 @@ LABEL \
   org.opencontainers.image.source="git@github.com:glpi-project/docker-images"
 
 RUN \
+     PHP_MAJOR_VERSION="$(echo $PHP_VERSION | cut -d '.' -f 1)" \
+  && PHP_MINOR_VERSION="$(echo $PHP_VERSION | cut -d '.' -f 2)" \
+  \
   # Update package list.
-  apt update \
+  && apt update \
   \
   # Install exif extension.
   && docker-php-ext-install exif \
@@ -61,13 +64,18 @@ RUN \
   && docker-php-ext-install zip \
   \
   # Install XMLRPC PHP extension.
-  # Install from Github (extension should be available on PECL but is not)
   && apt install --assume-yes --no-install-recommends --quiet libxml2-dev \
-  && mkdir -p /tmp/xmlrpc \
-  && (curl --fail --silent --show-error --location https://github.com/php/pecl-networking-xmlrpc/archive/0f782ffe52cebd0a65356427b7ab72d48b72d20c/xmlrpc-0f782ff.tar.gz | tar --extract --ungzip --verbose --directory="/tmp/xmlrpc" --strip 1) \
-  && docker-php-ext-configure /tmp/xmlrpc --with-xmlrpc \
-  && docker-php-ext-install /tmp/xmlrpc \
-  && rm -rf /tmp/xmlrpc \
+  && if [ $PHP_MAJOR_VERSION -lt "8" ]; then \
+    # For PHP < 8.x, install bundled extension
+    docker-php-ext-install xmlrpc \
+  ; else \
+    # For PHP 8+, install from Github (extension should be available on PECL but is not)
+    mkdir -p /tmp/xmlrpc \
+    && (curl --fail --silent --show-error --location https://github.com/php/pecl-networking-xmlrpc/archive/0f782ffe52cebd0a65356427b7ab72d48b72d20c/xmlrpc-0f782ff.tar.gz | tar --extract --ungzip --verbose --directory="/tmp/xmlrpc" --strip 1) \
+    && docker-php-ext-configure /tmp/xmlrpc --with-xmlrpc \
+    && docker-php-ext-install /tmp/xmlrpc \
+    && rm -rf /tmp/xmlrpc \
+  ; fi \
   \
   # Install APCU PHP extension.
   && pecl install apcu \
diff --git a/githubactions-php/Dockerfile b/githubactions-php/Dockerfile
index 5c3ee71..ac02e88 100644
--- a/githubactions-php/Dockerfile
+++ b/githubactions-php/Dockerfile
@@ -18,8 +18,11 @@ LABEL \
   org.opencontainers.image.source="git@github.com:glpi-project/docker-images"
 
 RUN \
+     PHP_MAJOR_VERSION="$(echo $PHP_VERSION | cut -d '.' -f 1)" \
+  && PHP_MINOR_VERSION="$(echo $PHP_VERSION | cut -d '.' -f 2)" \
+  \
   # Update package list.
-  apt update \
+  && apt update \
   \
   # Install exif extension.
   && docker-php-ext-install exif \
@@ -61,13 +64,18 @@ RUN \
   && docker-php-ext-install zip \
   \
   # Install XMLRPC PHP extension.
-  # Install from Github (extension should be available on PECL but is not)
   && apt install --assume-yes --no-install-recommends --quiet libxml2-dev \
-  && mkdir -p /tmp/xmlrpc \
-  && (curl --fail --silent --show-error --location https://github.com/php/pecl-networking-xmlrpc/archive/0f782ffe52cebd0a65356427b7ab72d48b72d20c/xmlrpc-0f782ff.tar.gz | tar --extract --ungzip --verbose --directory="/tmp/xmlrpc" --strip 1) \
-  && docker-php-ext-configure /tmp/xmlrpc --with-xmlrpc \
-  && docker-php-ext-install /tmp/xmlrpc \
-  && rm -rf /tmp/xmlrpc \
+  && if [ $PHP_MAJOR_VERSION -lt "8" ]; then \
+    # For PHP < 8.x, install bundled extension
+    docker-php-ext-install xmlrpc \
+  ; else \
+    # For PHP 8+, install from Github (extension should be available on PECL but is not)
+    mkdir -p /tmp/xmlrpc \
+    && (curl --fail --silent --show-error --location https://github.com/php/pecl-networking-xmlrpc/archive/0f782ffe52cebd0a65356427b7ab72d48b72d20c/xmlrpc-0f782ff.tar.gz | tar --extract --ungzip --verbose --directory="/tmp/xmlrpc" --strip 1) \
+    && docker-php-ext-configure /tmp/xmlrpc --with-xmlrpc \
+    && docker-php-ext-install /tmp/xmlrpc \
+    && rm -rf /tmp/xmlrpc \
+  ; fi \
   \
   # Install APCU PHP extension.
   && pecl install apcu \