diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index b1cff17c..ba8da949 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -1,11 +1,6 @@
 name: Test
 
-on:
-  push:
-    branches: [ $default-branch ]
-  pull_request:
-    branches: [ $default-branch ]
-  workflow_dispatch:
+on: [push, pull_request]
 
 jobs:
     test:
@@ -15,24 +10,13 @@ jobs:
 
         strategy:
             matrix:
-                php-version: ['7.4', '8.4']
-                symfony-version: ['5.4', '6.4', '7.4']
+                php-version: ['8.2', '8.3', '8.4', '8.5']
+                symfony-version: ['6.4', '7.4']
                 coverage: ['none']
-                exclude:
-                    - php-version: '7.4'
-                      symfony-version: '6.4'
-                    - php-version: '7.4'
-                      symfony-version: '7.0'
                 include:
-                    - php-version: '8.0'
-                      symfony-version: '5.4'
-                      coverage: xdebug
-                    - php-version: '8.1'
-                      symfony-version: '6.4'
-                      coverage: 'none'
-                    - php-version: '8.2'
-                      symfony-version: '6.4'
-                      coverage: 'none'
+                  - php-version: '8.3'
+                    symfony-version: '6.4'
+                    coverage: xdebug
 
         steps:
             - name: Checkout
diff --git a/composer.json b/composer.json
index 58511207..42978a8d 100644
--- a/composer.json
+++ b/composer.json
@@ -8,20 +8,19 @@
         "name" : "Alvaro Videla"
     }],
     "require": {
-        "php":                          "^7.4|^8.0",
-
-        "symfony/dependency-injection": "^4.4|^5.3|^6.0|^7.0",
-        "symfony/event-dispatcher":     "^4.4|^5.3|^6.0|^7.0",
-        "symfony/config":               "^4.4|^5.3|^6.0|^7.0",
-        "symfony/yaml":                 "^4.4|^5.3|^6.0|^7.0",
-        "symfony/console":              "^4.4|^5.3|^6.0|^7.0",
-        "php-amqplib/php-amqplib":      "^2.12.2|^3.0",
-        "psr/log":                      "^1.0 || ^2.0 || ^3.0",
-        "symfony/http-kernel":          "^4.4|^5.3|^6.0|^7.0",
-        "symfony/framework-bundle":     "^4.4|^5.3|^6.0|^7.0"
+        "php":                          "^8.2",
+        "symfony/dependency-injection": "^6.0 || ^7.0",
+        "symfony/event-dispatcher":     "^6.0 || ^7.0",
+        "symfony/config":               "^6.0 || ^7.0",
+        "symfony/yaml":                 "^6.0 || ^7.0",
+        "symfony/console":              "^6.0 || ^7.0",
+        "php-amqplib/php-amqplib":      "^2.12.2 || ^3.0",
+        "psr/log":                      "^2.0 || ^3.0",
+        "symfony/http-kernel":          "^6.0 || ^7.0",
+        "symfony/framework-bundle":     "^6.0 || ^7.0"
     },
     "require-dev": {
-        "symfony/serializer":           "^4.4|^5.3|^6.0|^7.0",
+        "symfony/serializer":           "^6.0 || ^7.0",
         "phpunit/phpunit":              "^9.5",
         "phpstan/phpstan":              "^1.2",
         "phpstan/phpstan-phpunit":      "^1.0"