diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 94e8032..beb42c8 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -23,8 +23,8 @@ We accept contributions via Pull Requests on [GitHub](https://github.com/stauden
 ## Running Tests & Static Analysis
 
 ```
-docker compose run --rm php8.3 composer install
-docker compose run --rm php8.3 vendor/bin/phpunit
-docker compose run --rm php8.3 vendor/bin/phpstan analyse --memory-limit=-1
-docker compose run --rm php8.3 vendor/bin/phpstan analyse --configuration=phpstan.types.neon.dist --memory-limit=-1
+docker compose run --rm php8.4 composer install
+docker compose run --rm php8.4 vendor/bin/phpunit
+docker compose run --rm php8.4 vendor/bin/phpstan analyse --memory-limit=-1
+docker compose run --rm php8.4 vendor/bin/phpstan analyse --configuration=phpstan.types.neon.dist --memory-limit=-1
 ```
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cd4b10b..d7a6789 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
         database: [ mysql, mariadb, pgsql, sqlite, sqlsrv ]
         release: [ stable, lowest ]
         include:
-          - php: 8.3
+          - php: 8.4
             release: stable
             coverage: true
 
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 24bba14..3b633f9 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [ 8.3 ]
+        php: [ 8.4 ]
         release: [ stable ]
 
     steps:
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index ebe7613..54ecae9 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -15,20 +15,20 @@ services:
     volumes:
       - .:/var/www/html:delegated
       - ~/.cache/composer/files:/root/.composer/cache/files
-  php8.3-xdebug:
-    image: ghcr.io/staudenmeir/php:8.3
+  php8.4:
+    image: ghcr.io/staudenmeir/php:8.4
     working_dir: /var/www/html
     networks:
       - test
     volumes:
       - .:/var/www/html:delegated
-      - .docker/xdebug.ci.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
       - ~/.cache/composer/files:/root/.composer/cache/files
-  php8.4:
+  php8.4-xdebug:
     image: ghcr.io/staudenmeir/php:8.4
     working_dir: /var/www/html
     networks:
       - test
     volumes:
       - .:/var/www/html:delegated
+      - .docker/xdebug.ci.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
       - ~/.cache/composer/files:/root/.composer/cache/files
diff --git a/docker-compose.yml b/docker-compose.yml
index 2424d10..5fc6f68 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
       - test
     volumes:
       - .:/var/www/html:delegated
-      #- .docker/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+      - .docker/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
   mysql:
     image: 'mysql:latest'
     environment: