diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 27c77d0..dcc1e1d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,18 +17,53 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: ["7.4", "8.0", "8.1"]
-                symfony: ["~4.4", "~5.4"]
+                php: ["7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5"]
+                symfony: ["~4.4", "~5.4", "^6.0", "^7.0", "^8.0"]
 
-                include:
-                    -   php: "8.0"
-                        symfony: "~6.0"
+                exclude:
+                    # Symfony 5.0 only with PHP 7.4
+                    - php: "8.0"
+                      symfony: "^5.0"
+                    - php: "8.1"
+                      symfony: "^5.0"
+                    - php: "8.2"
+                      symfony: "^5.0"
+                    - php: "8.3"
+                      symfony: "^5.0"
+                    - php: "8.4"
+                      symfony: "^5.0"
+                    - php: "8.5"
+                      symfony: "^5.0"
 
-                    -   php: "8.1"
-                        symfony: "~6.0"
+                    # Symfony 8.0 only supports PHP 8.5+
+                    - php: "7.4"
+                      symfony: "^8.0"
+                    - php: "8.0"
+                      symfony: "^8.0"
+                    - php: "8.1"
+                      symfony: "^8.0"
+                    - php: "8.2"
+                      symfony: "^8.0"
+                    - php: "8.3"
+                      symfony: "^8.0"
+                    - php: "8.4"
+                      symfony: "^8.0"
 
-                    -   php: "8.2"
-                        symfony: "~7.0"
+                    # Symfony 7.0 requires PHP 8.1+
+                    - php: "7.4"
+                      symfony: "^7.0"
+                    - php: "8.0"
+                      symfony: "^7.0"
+                    - php: "8.1"
+                      symfony: "^7.0"
+
+                    # Additional exclusions
+                    - php: "7.4"
+                      symfony: "^6.0"
+                    - php: "8.4"
+                      symfony: "~4.4"
+                    - php: "8.5"
+                      symfony: "~4.4"
 
         steps:
             -
diff --git a/composer.json b/composer.json
index 948e677..0a18f43 100644
--- a/composer.json
+++ b/composer.json
@@ -11,12 +11,12 @@
         }
     ],
     "require": {
-        "php":                      "^7.4|^8.0|^8.1",
-        "winzou/state-machine":     "~0.4",
-        "symfony/framework-bundle": "^4.4|^5.4|^6.0|^7.0"
+        "php":                      "^7.4|^8.0",
+        "winzou/state-machine":     "^0.4",
+        "symfony/framework-bundle": "^4.4|^5.4|^6.0|^7.0|^8.0"
     },
     "require-dev": {
-        "phpspec/phpspec": "^5.0|^6.0|^7.0"
+        "phpspec/phpspec": "^5.0|^6.0|^7.0|^8.0"
     },
     "autoload": {
         "psr-4": { "winzou\\Bundle\\StateMachineBundle\\": "" }