diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cf9d015..525516f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ on:
 
 env:
   COVERAGE: '1'
-  default_php_version: '8.0'
+  default_php_version: '8.1'
   php_extensions: 'pcov, json'
 
 jobs:
@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: [ '8.0', '8.1', '8.2', '8.3' ]
+        php-versions: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
     uses: 'tochka-developers/actions/.github/workflows/analyze.yml@v1'
     with:
       php-version: ${{ matrix.php-versions }}
diff --git a/composer.json b/composer.json
index a814b81..fc16645 100644
--- a/composer.json
+++ b/composer.json
@@ -13,14 +13,14 @@
         "openrpc"
     ],
     "require": {
-        "php": "8.1.*|8.2.*|8.3.*|8.4.*",
-        "doctrine/annotations": "^1.11",
+        "php": "^8.1",
+        "doctrine/annotations": "^1.11|^2.0",
         "spiral/attributes": "^2.8|^3.0"
     },
     "require-dev": {
         "laravel/pint": "^1.19",
         "roave/security-advisories": "dev-latest",
-        "vimeo/psalm": "^5.26"
+        "vimeo/psalm": "^5.26|^6.0"
     },
     "autoload": {
         "psr-4": {
@@ -31,9 +31,11 @@
         "lint": "pint --test",
         "lint-fix": "pint",
         "analyze": "psalm --no-cache",
-        "analyze-8.0": "psalm --php-version=8.0 --output-format=github --shepherd",
         "analyze-8.1": "psalm --php-version=8.1 --output-format=github --shepherd",
         "analyze-8.2": "psalm --php-version=8.2 --output-format=github --shepherd",
+        "analyze-8.3": "psalm --php-version=8.3 --output-format=github --shepherd",
+        "analyze-8.4": "psalm --php-version=8.4 --output-format=github --shepherd",
+        "analyze-8.5": "psalm --php-version=8.5 --output-format=github --shepherd",
         "pint": "vendor/bin/pint",
         "psalm": "vendor/bin/psalm --output-format=phpstorm --no-cache"
     }
diff --git a/src/Annotations/ApiArrayShape.php b/src/Annotations/ApiArrayShape.php
index 59eb91c..a5b7774 100644
--- a/src/Annotations/ApiArrayShape.php
+++ b/src/Annotations/ApiArrayShape.php
@@ -2,7 +2,7 @@
 
 namespace Tochka\JsonRpc\Annotations;
 
-use Spiral\Attributes\NamedArgumentConstructor;
+use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 use Tochka\JsonRpc\Contracts\ApiAnnotationInterface;
 
 /**
diff --git a/src/Annotations/ApiExpectedValues.php b/src/Annotations/ApiExpectedValues.php
index bf8a361..5283417 100644
--- a/src/Annotations/ApiExpectedValues.php
+++ b/src/Annotations/ApiExpectedValues.php
@@ -2,7 +2,7 @@
 
 namespace Tochka\JsonRpc\Annotations;
 
-use Spiral\Attributes\NamedArgumentConstructor;
+use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 use Tochka\JsonRpc\Contracts\ApiAnnotationInterface;
 
 /**
diff --git a/src/Annotations/ApiIgnore.php b/src/Annotations/ApiIgnore.php
index e36b4a1..bf5e148 100644
--- a/src/Annotations/ApiIgnore.php
+++ b/src/Annotations/ApiIgnore.php
@@ -2,7 +2,7 @@
 
 namespace Tochka\JsonRpc\Annotations;
 
-use Spiral\Attributes\NamedArgumentConstructor;
+use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 use Tochka\JsonRpc\Contracts\ApiAnnotationInterface;
 
 /**
diff --git a/src/Annotations/ApiIgnoreMethod.php b/src/Annotations/ApiIgnoreMethod.php
index 5dbde02..4e2ad2c 100644
--- a/src/Annotations/ApiIgnoreMethod.php
+++ b/src/Annotations/ApiIgnoreMethod.php
@@ -2,7 +2,7 @@
 
 namespace Tochka\JsonRpc\Annotations;
 
-use Spiral\Attributes\NamedArgumentConstructor;
+use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 use Tochka\JsonRpc\Contracts\ApiAnnotationInterface;
 
 /**
diff --git a/src/Annotations/ApiMapRequestToObject.php b/src/Annotations/ApiMapRequestToObject.php
index cbb8d0b..76b2f59 100644
--- a/src/Annotations/ApiMapRequestToObject.php
+++ b/src/Annotations/ApiMapRequestToObject.php
@@ -2,7 +2,7 @@
 
 namespace Tochka\JsonRpc\Annotations;
 
-use Spiral\Attributes\NamedArgumentConstructor;
+use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 use Tochka\JsonRpc\Contracts\ApiAnnotationInterface;
 
 /**
diff --git a/src/Annotations/ApiValueExample.php b/src/Annotations/ApiValueExample.php
index 32eceae..c7f3d69 100644
--- a/src/Annotations/ApiValueExample.php
+++ b/src/Annotations/ApiValueExample.php
@@ -2,7 +2,7 @@
 
 namespace Tochka\JsonRpc\Annotations;
 
-use Spiral\Attributes\NamedArgumentConstructor;
+use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 use Tochka\JsonRpc\Contracts\ApiAnnotationInterface;
 
 /**
diff --git a/src/Annotations/Sometimes.php b/src/Annotations/Sometimes.php
index c4c903f..a484860 100644
--- a/src/Annotations/Sometimes.php
+++ b/src/Annotations/Sometimes.php
@@ -2,7 +2,7 @@
 
 namespace Tochka\JsonRpc\Annotations;
 
-use Spiral\Attributes\NamedArgumentConstructor;
+use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 use Tochka\JsonRpc\Contracts\ApiAnnotationInterface;
 
 /**
diff --git a/src/Annotations/TimeZone.php b/src/Annotations/TimeZone.php
index 3c08ee3..98236e3 100644
--- a/src/Annotations/TimeZone.php
+++ b/src/Annotations/TimeZone.php
@@ -2,7 +2,7 @@
 
 namespace Tochka\JsonRpc\Annotations;
 
-use Spiral\Attributes\NamedArgumentConstructor;
+use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 use Tochka\JsonRpc\Contracts\ApiAnnotationInterface;
 
 /**
diff --git a/src/Annotations/ValidationRule.php b/src/Annotations/ValidationRule.php
index 1f6eb32..fbcdfe8 100644
--- a/src/Annotations/ValidationRule.php
+++ b/src/Annotations/ValidationRule.php
@@ -2,7 +2,7 @@
 
 namespace Tochka\JsonRpc\Annotations;
 
-use Spiral\Attributes\NamedArgumentConstructor;
+use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 use Tochka\JsonRpc\Contracts\ApiAnnotationInterface;
 
 /**