diff --git a/.github/workflows/glpi-development-env.yml b/.github/workflows/glpi-development-env.yml
index f3eb99e..ce83955 100644
--- a/.github/workflows/glpi-development-env.yml
+++ b/.github/workflows/glpi-development-env.yml
@@ -29,6 +29,7 @@ jobs:
           - {base-image: "php:8.2-apache-trixie", php-version: "8.2", latest: "false"}
           - {base-image: "php:8.3-apache-trixie", php-version: "8.3", latest: "false"}
           - {base-image: "php:8.4-apache-trixie", php-version: "8.4", latest: "true"}
+          - {base-image: "php:8.5-rc-apache-trixie", php-version: "8.5", latest: "false"}
     steps:
       - name: "Set variables"
         run: |
diff --git a/glpi-development-env/Dockerfile b/glpi-development-env/Dockerfile
index ca73f28..4bb83ce 100644
--- a/glpi-development-env/Dockerfile
+++ b/glpi-development-env/Dockerfile
@@ -19,6 +19,7 @@ LABEL \
 
 RUN apt update \
   && PHP_MAJOR_VERSION="$(echo $PHP_VERSION | cut -d '.' -f 1)" \
+  && PHP_MINOR_VERSION="$(echo $PHP_VERSION | cut -d '.' -f 2)" \
   \
   # Install bz2 extension (for marketplace).
   && apt install --assume-yes --no-install-recommends --quiet libbz2-dev \
@@ -52,8 +53,10 @@ RUN apt update \
   # Install bcmath PHP extension.
   && docker-php-ext-install bcmath \
   \
-  # Install opcache PHP extension.
-  && docker-php-ext-install opcache \
+  # Install opcache PHP extension (it is already enabled in PHP 8.5+ images).
+  && if [ $PHP_MINOR_VERSION -ne "8.5" ]; then \
+    docker-php-ext-install opcache \
+  ; fi \
   \
   # Install pcntl PHP extension (required for composer-require-checker).
   && docker-php-ext-install pcntl \