diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d4719aa..5e499ef 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,6 +12,13 @@ jobs:
 
         runs-on: ubuntu-latest
 
+        strategy:
+            fail-fast: false
+            matrix:
+                php-version:
+                    - "8.4"
+                    - "8.5"
+
         steps:
           - name: Checkout
             uses: actions/checkout@v4
@@ -19,7 +26,7 @@ jobs:
           - name: Install PHP
             uses: shivammathur/setup-php@v2
             with:
-              php-version: 8.4
+              php-version: ${{ matrix.php-version }}
               extensions: mbstring
               coverage: none
               tools: none
@@ -38,6 +45,13 @@ jobs:
 
         runs-on: ubuntu-latest
 
+        strategy:
+            fail-fast: false
+            matrix:
+                php-version:
+                    - "8.4"
+                    - "8.5"
+
         steps:
             - name: Checkout
               uses: actions/checkout@v4
@@ -45,7 +59,7 @@ jobs:
             - name: Install PHP
               uses: shivammathur/setup-php@v2
               with:
-                php-version: 8.4
+                php-version: ${{ matrix.php-version }}
                 extensions: mbstring
                 coverage: none
                 tools: none
@@ -72,6 +86,7 @@ jobs:
             matrix:
                 php-version:
                     - "8.4"
+                    - "8.5"
 
         steps:
             - name: Checkout
diff --git a/docker-compose.yml b/docker-compose.yml
index b957e9a..a485f1d 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,5 @@
 services:
-  cli:
+  cli-8.4:
     build: docker/8.4
     restart: 'no'
     tty: true
@@ -7,3 +7,12 @@ services:
     working_dir: /app
     volumes:
       - .:/app
+
+  cli-8.5:
+    build: docker/8.5
+    restart: 'no'
+    tty: true
+    stdin_open: true
+    working_dir: /app
+    volumes:
+      - .:/app
\ No newline at end of file
diff --git a/docker/8.5/Dockerfile b/docker/8.5/Dockerfile
new file mode 100644
index 0000000..d56a214
--- /dev/null
+++ b/docker/8.5/Dockerfile
@@ -0,0 +1,24 @@
+FROM composer:2.9.5 AS composer
+FROM php:8.5-cli
+
+LABEL maintainer="Rayan Levert <rayanlevert@msn.com>"
+
+# Installing packages needed
+RUN apt-get update -y && \
+    apt-get install -y \
+    git \
+    zip
+
+# Enabling xdebug
+RUN pecl install xdebug && docker-php-ext-enable xdebug
+
+# Creates the app directory
+RUN mkdir /app
+
+# Volumes
+VOLUME ["/app"]
+
+# Composer
+COPY --from=composer /usr/bin/composer /usr/local/bin/composer
+
+CMD ["php"]
\ No newline at end of file