diff --git a/.github/workflows/reusable-CI-workflow.yml b/.github/workflows/reusable-CI-workflow.yml
index 3633d6b..7e0e9f2 100644
--- a/.github/workflows/reusable-CI-workflow.yml
+++ b/.github/workflows/reusable-CI-workflow.yml
@@ -60,13 +60,14 @@ jobs:
           - job-name: Up to date versions # => Highest versions allowed by composer config
             php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
             symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-max }}'
-            ## Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
+            # Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
             pkg-extra-constraints: behat/gherkin:~4.12.0
           - job-name: Up to date versions - Special case - Symfony 5.4
             php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
             symfony-version: '5.4'
-            ## Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
-            pkg-extra-constraints: behat/gherkin:~4.12.0
+            # Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
+            # Fix - symfony/yaml - Avoid issue with Sf YAML 6.4+ and Framework bundle
+            pkg-extra-constraints: behat/gherkin:~4.12.0 ${{ ( needs.fetch-supported-versions.outputs.symfony-max == '6.4' ) && 'symfony/yaml:~6.4.0' || '' }}
           - job-name: Bare minimum # => Lowest versions allowed by composer config
             php-version: '${{ needs.fetch-supported-versions.outputs.php-min }}'
             symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-min }}'
@@ -244,13 +245,15 @@ jobs:
             php-version: ${{ needs.fetch-supported-versions.outputs.php-max }}
             symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-next }}
             # Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
-            pkg-extra-constraints: behat/gherkin:~4.12.0
+            # Fix - symfony/framework-bundle - Framework bundle <7.0 require php 8.1 minimum !
+            pkg-extra-constraints: behat/gherkin:~4.12.0  ${{ ( needs.fetch-supported-versions.outputs.symfony-next == '7.0' && needs.fetch-supported-versions.outputs.php-max == '8.4' ) && 'symfony/framework-bundle:~7.0.0@dev' || '' }}
           - job-name: Symfony - With lowest supported PHP version
             # Fix - Sf 7.0 require php 8.1 minimum, most of deps require 8.2 !
-            php-version: ${{ ( needs.fetch-supported-versions.outputs.symfony-next == '6.3' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.1' || needs.fetch-supported-versions.outputs.php-min }}
+            php-version: ${{ ( needs.fetch-supported-versions.outputs.symfony-next == '7.0' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.2' || needs.fetch-supported-versions.outputs.php-min }}
             symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-next }}
             # Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
-            pkg-extra-constraints: behat/gherkin:~4.12.0
+            # Fix - symfony/framework-bundle - Framework bundle <7.0 require php 8.1 minimum !
+            pkg-extra-constraints: behat/gherkin:~4.12.0 ${{ ( needs.fetch-supported-versions.outputs.symfony-next == '7.0' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && 'symfony/framework-bundle:~7.0.0@dev' || '' }}
 
     steps:
       - name: Check out code
diff --git a/.github/workflows/supported-versions.json b/.github/workflows/supported-versions.json
index 7ff4a2a..9a11141 100644
--- a/.github/workflows/supported-versions.json
+++ b/.github/workflows/supported-versions.json
@@ -1,4 +1,4 @@
 {
-    "php": {"min": "8.0", "max": "8.2", "next": "8.3"},
-    "symfony": {"min": "4.4", "max": "6.0", "next": "6.3"}
+    "php": {"min": "8.0", "max": "8.4", "next": "8.5"},
+    "symfony": {"min": "4.4", "max": "6.4", "next": "7.0"}
 }
diff --git a/composer.json b/composer.json
index 2e1438f..6cc8976 100644
--- a/composer.json
+++ b/composer.json
@@ -41,8 +41,8 @@
   "require-dev": {
     "behat/behat": "^3.9.0,<=3.16.1",
     "dvdoug/behat-code-coverage": "^5.0",
-    "matthiasnoback/symfony-config-test": "^4.0",
-    "matthiasnoback/symfony-dependency-injection-test": "^4.0",
+    "matthiasnoback/symfony-config-test": "^4.0 || ^5.0",
+    "matthiasnoback/symfony-dependency-injection-test": "^4.0 || ^5.0",
     "phpspec/prophecy": "^1.15",
     "phpspec/prophecy-phpunit": "^2.0",
     "phpunit/php-code-coverage": "^9.2.4",