diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index fea1c189..9614241b 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -29,7 +29,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
                   extensions: mongodb
@@ -54,7 +54,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2, composer-normalize:2
               env:
diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
index ace3b7be..93922b60 100644
--- a/.github/workflows/qa.yaml
+++ b/.github/workflows/qa.yaml
@@ -29,7 +29,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
                   extensions: mongodb
@@ -54,7 +54,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
                   extensions: mongodb
@@ -65,7 +65,7 @@ jobs:
                   dependency-versions: highest
 
             - name: Psalm
-              run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.4
+              run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.5
 
     rector:
         name: Rector
@@ -79,7 +79,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
                   extensions: mongodb
diff --git a/.github/workflows/symfony-lint.yaml b/.github/workflows/symfony-lint.yaml
index d8df070b..ea791faf 100644
--- a/.github/workflows/symfony-lint.yaml
+++ b/.github/workflows/symfony-lint.yaml
@@ -29,7 +29,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
 
@@ -53,7 +53,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
 
@@ -77,7 +77,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
 
@@ -101,7 +101,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
 
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 93ef10f7..8eb8deb8 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -36,34 +36,39 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - '8.1'
                     - '8.2'
                     - '8.3'
                     - '8.4'
+                    - '8.5'
                 dependencies: [highest]
                 allowed-to-fail: [false]
                 symfony-require: ['']
                 variant: [normal]
                 include:
-                    - php-version: '8.1'
+                    - php-version: '8.2'
                       dependencies: lowest
                       allowed-to-fail: false
                       variant: normal
-                    - php-version: '8.4'
+                    - php-version: '8.5'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 6.4.*
                       variant: symfony/symfony:"6.4.*"
-                    - php-version: '8.4'
+                    - php-version: '8.5'
                       dependencies: highest
                       allowed-to-fail: false
-                      symfony-require: 7.1.*
-                      variant: symfony/symfony:"7.1.*"
-                    - php-version: '8.4'
+                      symfony-require: 7.3.*
+                      variant: symfony/symfony:"7.3.*"
+                    - php-version: '8.5'
                       dependencies: highest
                       allowed-to-fail: false
-                      symfony-require: 7.2.*
-                      variant: symfony/symfony:"7.2.*"
+                      symfony-require: 7.4.*
+                      variant: symfony/symfony:"7.4.*"
+                    - php-version: '8.5'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 8.0.*
+                      variant: symfony/symfony:"8.0.*"
 
         steps:
             - name: Checkout
@@ -80,6 +85,11 @@ jobs:
             - name: Add PHPUnit matcher
               run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
+            # until Psalm supports Symfony 8
+            - name: Remove psalm
+              if: matrix.symfony-require == '8.0.*'
+              run: composer remove vimeo/psalm psalm/plugin-symfony psalm/plugin-phpunit --dev --no-update
+
             - name: Install variant
               if: matrix.variant != 'normal' && !startsWith(matrix.variant, 'symfony/symfony')
               run: composer require ${{ matrix.variant }} --no-update
diff --git a/.gitignore b/.gitignore
index 3fc5b4a9..2fa6c0d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ composer.lock
 phpunit.xml
 phpstan.neon
 /.phpunit.result.cache
+tests/App/config/reference.php
 /docs/_build/
diff --git a/Makefile b/Makefile
index 1f772ffc..1cc4346e 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ phpstan:
 .PHONY: phpstan
 
 psalm:
-	vendor/bin/psalm --php-version=8.4
+	vendor/bin/psalm --php-version=8.5
 .PHONY: psalm
 
 rector:
diff --git a/rector.php b/rector.php
index 085115f2..3f21a4ed 100644
--- a/rector.php
+++ b/rector.php
@@ -33,7 +33,7 @@
     ]);
 
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_81,
+        LevelSetList::UP_TO_PHP_82,
         PHPUnitSetList::PHPUNIT_100,
         PHPUnitSetList::PHPUNIT_CODE_QUALITY,
     ]);