diff --git a/.phive/phars.xml b/.phive/phars.xml
index a655ee4..f5aa330 100644
--- a/.phive/phars.xml
+++ b/.phive/phars.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="2.1.0" installed="2.1.0" location="./tools/phpstan" copy="false"/>
-  <phar name="psalm" version="5.26.1" installed="5.26.1" location="./tools/psalm" copy="false"/>
+  <phar name="phpstan" version="2.1.17" installed="2.1.17" location="./tools/phpstan" copy="false"/>
 </phive>
diff --git a/composer.json b/composer.json
index bae7d30..8b10a6f 100644
--- a/composer.json
+++ b/composer.json
@@ -70,12 +70,7 @@
         "cs-check": "phpcs --colors -p src/ tests/",
         "cs-fix": "phpcbf --colors -p src/ tests/",
         "phpstan": "tools/phpstan analyse",
-        "psalm": "tools/psalm --show-info=false",
-        "psalm-baseline": "tools/psalm  --set-baseline=psalm-baseline.xml",
-        "stan": [
-            "@phpstan",
-            "@psalm"
-        ],
+        "stan": "@phpstan",
         "stan-baseline": "tools/phpstan --generate-baseline",
         "stan-setup": "phive install",
         "test": "phpunit",
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
deleted file mode 100644
index c2de957..0000000
--- a/psalm-baseline.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
-  <file src="src/Controller/Component/AuthorizationComponent.php">
-    <InvalidReturnStatement>
-      <code><![CDATA[$this->performCheck($resource, $action)]]></code>
-      <code><![CDATA[$this->performCheck($resource, $action, 'canResult')]]></code>
-    </InvalidReturnStatement>
-    <InvalidReturnType>
-      <code><![CDATA[\Authorization\Policy\ResultInterface]]></code>
-      <code><![CDATA[bool]]></code>
-    </InvalidReturnType>
-  </file>
-</files>
diff --git a/psalm.xml b/psalm.xml
deleted file mode 100644
index 237111d..0000000
--- a/psalm.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    errorBaseline="psalm-baseline.xml"
-    autoloader="tests/bootstrap.php"
-    findUnusedPsalmSuppress="true"
-    findUnusedBaselineEntry="true"
-    findUnusedCode="false"
->
-    <projectFiles>
-        <directory name="src" />
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
-    </projectFiles>
-
-    <issueHandlers>
-        <MissingClosureReturnType errorLevel="info" />
-
-        <PropertyNotSetInConstructor errorLevel="info" />
-        <MissingConstructor errorLevel="info" />
-        <MissingClosureParamType errorLevel="info" />
-
-        <RedundantConditionGivenDocblockType errorLevel="info" />
-        <RiskyTruthyFalsyComparison errorLevel="info" />
-    </issueHandlers>
-</psalm>
diff --git a/src/Identity.php b/src/Identity.php
index ff63c12..0d2ab25 100644
--- a/src/Identity.php
+++ b/src/Identity.php
@@ -29,7 +29,6 @@ class Identity extends IdentityDecorator implements AuthenIdentityInterface
      * Identity data
      *
      * @var \Authentication\IdentityInterface
-     * @psalm-suppress NonInvariantDocblockPropertyType
      */
     protected ArrayAccess|array $identity;
 
diff --git a/src/Policy/OrmResolver.php b/src/Policy/OrmResolver.php
index c4be0bf..882eb97 100644
--- a/src/Policy/OrmResolver.php
+++ b/src/Policy/OrmResolver.php
@@ -107,7 +107,6 @@ protected function getEntityPolicy(EntityInterface $entity): mixed
         $class = get_class($entity);
         $entityNamespace = '\Model\Entity\\';
         $namespace = str_replace('\\', '/', substr($class, 0, (int)strpos($class, $entityNamespace)));
-        /** @psalm-suppress PossiblyFalseOperand */
         $name = substr($class, strpos($class, $entityNamespace) + strlen($entityNamespace));
 
         return $this->findPolicy($class, $name, $namespace);
@@ -124,7 +123,6 @@ protected function getRepositoryPolicy(RepositoryInterface $table): mixed
         $class = get_class($table);
         $tableNamespace = '\Model\Table\\';
         $namespace = str_replace('\\', '/', substr($class, 0, (int)strpos($class, $tableNamespace)));
-        /** @psalm-suppress PossiblyFalseOperand */
         $name = substr($class, strpos($class, $tableNamespace) + strlen($tableNamespace));
 
         return $this->findPolicy($class, $name, $namespace);