diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index b317089..9393a6d 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -17,6 +17,8 @@ jobs:
         php:
           - "8.2"
           - "8.3"
+          - "8.4"
+          - "8.5"
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/qodana_code_quality.yml b/.github/workflows/qodana_code_quality.yml
index d418123..9078a36 100644
--- a/.github/workflows/qodana_code_quality.yml
+++ b/.github/workflows/qodana_code_quality.yml
@@ -16,7 +16,7 @@ jobs:
       checks: write
     strategy:
       matrix:
-        php-versions: [ '8.2', '8.3' ]
+        php-versions: [ '8.2', '8.3', '8.4', '8.5' ]
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index ee7251d..9976515 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -17,6 +17,8 @@ jobs:
         php:
           - "8.2"
           - "8.3"
+          - "8.4"
+          - "8.5"
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/validate-database-schema.yml b/.github/workflows/validate-database-schema.yml
index 3c2b0dc..9acb870 100644
--- a/.github/workflows/validate-database-schema.yml
+++ b/.github/workflows/validate-database-schema.yml
@@ -24,6 +24,8 @@ jobs:
         php:
           - "8.2"
           - "8.3"
+          - "8.4"
+          - "8.5"
 
     steps:
       - name: Checkout
diff --git a/bin/doctrine b/bin/doctrine
index 2742869..56d0bbc 100644
--- a/bin/doctrine
+++ b/bin/doctrine
@@ -4,27 +4,24 @@
 declare(strict_types=1);
 
 use Core\App\Event\TablePrefixEventListener;
+use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Events;
 use Doctrine\ORM\Tools\Console\ConsoleRunner;
 use Doctrine\ORM\Tools\Console\EntityManagerProvider\SingleManagerProvider;
 use Dot\DataFixtures\Command\ExecuteFixturesCommand;
 use Dot\DataFixtures\Command\ListFixturesCommand;
-use Doctrine\ORM\EntityManager;
 
 require_once 'vendor/autoload.php';
 
-$container = require 'config/container.php' ;
+$container = require 'config/container.php';
 
 $entityManager = $container->get(EntityManager::class);
 $entityManager->getEventManager()
     ->addEventListener(Events::loadClassMetadata, $container->get(TablePrefixEventListener::class));
 
 $commands = [
-     $container->get(ExecuteFixturesCommand::class),
-     $container->get(ListFixturesCommand::class),
+    $container->get(ExecuteFixturesCommand::class),
+    $container->get(ListFixturesCommand::class),
 ];
 
-ConsoleRunner::run(
-    new SingleManagerProvider($entityManager),
-    $commands
-);
+ConsoleRunner::run(new SingleManagerProvider($entityManager), $commands);
diff --git a/composer.json b/composer.json
index 9d587b2..26a916a 100644
--- a/composer.json
+++ b/composer.json
@@ -49,7 +49,7 @@
         }
     },
     "require": {
-        "php": "~8.2.0 || ~8.3.0",
+        "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
         "ext-gd": "*",
         "ext-json": "*",
         "dotkernel/dot-cache": "^4.3",
@@ -77,7 +77,7 @@
         "mezzio/mezzio-problem-details": "^1.15.0",
         "ramsey/uuid": "^4.5.0",
         "ramsey/uuid-doctrine": "^2.1.0",
-        "roave/psr-container-doctrine": "^5.2.2",
+        "roave/psr-container-doctrine": "^5.2.2 || ^6.0.0",
         "symfony/filesystem": "^7.2.0",
         "zircote/swagger-php": "^5.0.7"
     },
diff --git a/config/autoload/cli.global.php b/config/autoload/cli.global.php
index 1c91bd3..777ddbd 100644
--- a/config/autoload/cli.global.php
+++ b/config/autoload/cli.global.php
@@ -12,9 +12,9 @@
         'version'  => '1.0.0',
         'name'     => 'Dotkernel CLI',
         'commands' => [
-            RouteListCommand::getDefaultName()     => RouteListCommand::class,
-            AdminCreateCommand::getDefaultName()   => AdminCreateCommand::class,
-            TokenGenerateCommand::getDefaultName() => TokenGenerateCommand::class,
+            RouteListCommand::$defaultName     => RouteListCommand::class,
+            AdminCreateCommand::$defaultName   => AdminCreateCommand::class,
+            TokenGenerateCommand::$defaultName => TokenGenerateCommand::class,
         ],
     ],
     FileLockerInterface::class => [
diff --git a/src/Admin/src/Command/AdminCreateCommand.php b/src/Admin/src/Command/AdminCreateCommand.php
index 8c8a8af..7e9010e 100644
--- a/src/Admin/src/Command/AdminCreateCommand.php
+++ b/src/Admin/src/Command/AdminCreateCommand.php
@@ -36,7 +36,7 @@
 class AdminCreateCommand extends Command
 {
     /** @var string $defaultName */
-    protected static $defaultName = 'admin:create';
+    public static $defaultName = 'admin:create';
 
     #[Inject(
         AdminServiceInterface::class,
diff --git a/src/App/src/Command/TokenGenerateCommand.php b/src/App/src/Command/TokenGenerateCommand.php
index 3801b10..19c9f81 100644
--- a/src/App/src/Command/TokenGenerateCommand.php
+++ b/src/App/src/Command/TokenGenerateCommand.php
@@ -25,7 +25,7 @@
 class TokenGenerateCommand extends Command
 {
     /** @var string $defaultName */
-    protected static $defaultName      = 'token:generate';
+    public static $defaultName         = 'token:generate';
     private string $typeErrorReporting = 'error-reporting';
 
     #[Inject(
diff --git a/src/Core/src/App/src/Command/RouteListCommand.php b/src/Core/src/App/src/Command/RouteListCommand.php
index e932657..d399ed5 100644
--- a/src/Core/src/App/src/Command/RouteListCommand.php
+++ b/src/Core/src/App/src/Command/RouteListCommand.php
@@ -31,7 +31,7 @@
 class RouteListCommand extends Command
 {
     /** @var string $defaultName */
-    protected static $defaultName = 'route:list';
+    public static $defaultName = 'route:list';
 
     #[Inject(
         Application::class,
diff --git a/test/Unit/App/Attribute/MethodDeprecationTest.php b/test/Unit/App/Attribute/MethodDeprecationTest.php
index dfd2db3..911b19e 100644
--- a/test/Unit/App/Attribute/MethodDeprecationTest.php
+++ b/test/Unit/App/Attribute/MethodDeprecationTest.php
@@ -116,7 +116,8 @@ public function handle(ServerRequestInterface $request): ResponseInterface
     }
 
     /**
-     * @param ReflectionClass<RequestHandlerInterface> $reflectionClass
+     * @template T of RequestHandlerInterface
+     * @param ReflectionClass<T> $reflectionClass
      * @return array<int, mixed>
      */
     private function getAttributes(ReflectionClass $reflectionClass): array