diff --git a/.phive/phars.xml b/.phive/phars.xml
index a655ee46..f5aa3300 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 d41d0d33..fedab7a3 100644
--- a/composer.json
+++ b/composer.json
@@ -61,12 +61,7 @@
         "cs-check": "phpcs --parallel=16 -p src/ tests/",
         "cs-fix": "phpcbf --parallel=16 -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 e510fb81..00000000
--- a/psalm-baseline.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015">
-  <file src="src/Command/PluginCommand.php">
-    <InternalClass>
-      <code>new Filesystem()</code>
-    </InternalClass>
-    <InternalMethod>
-      <code>findRecursive</code>
-    </InternalMethod>
-  </file>
-  <file src="src/Command/TestCommand.php">
-    <InternalClass>
-      <code>new Filesystem()</code>
-    </InternalClass>
-    <InternalMethod>
-      <code>find</code>
-    </InternalMethod>
-  </file>
-</files>
diff --git a/psalm.xml b/psalm.xml
deleted file mode 100644
index 1b5062a7..00000000
--- a/psalm.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    errorLevel="4"
-    resolveFromConfigFile="true"
-    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"
-    autoloader="tests/bootstrap.php"
-    errorBaseline="psalm-baseline.xml"
-    findUnusedPsalmSuppress="true"
-    findUnusedBaselineEntry="true"
-    findUnusedCode="false"
->
-    <projectFiles>
-        <directory name="src" />
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
-    </projectFiles>
-</psalm>
diff --git a/src/BakePlugin.php b/src/BakePlugin.php
index bb91af0d..0b02eaad 100644
--- a/src/BakePlugin.php
+++ b/src/BakePlugin.php
@@ -115,7 +115,7 @@ protected function discoverCommands(CommandCollection $commands): CommandCollect
      * @param string $namespace The namespace classes are expected to be in.
      * @param string $path The path to look in.
      * @return array<string>
-     * @psalm-return array<string, class-string<\Bake\Command\BakeCommand>>
+     * @phpstan-return array<string, class-string<\Bake\Command\BakeCommand>>
      */
     protected function findInPath(string $namespace, string $path): array
     {
diff --git a/src/Command/EntryCommand.php b/src/Command/EntryCommand.php
index b950ef3d..87b9dd75 100644
--- a/src/Command/EntryCommand.php
+++ b/src/Command/EntryCommand.php
@@ -130,7 +130,6 @@ public function execute(Arguments $args, ConsoleIo $io): ?int
     public function buildOptionParser(ConsoleOptionParser $parser): ConsoleOptionParser
     {
         $this->help = new HelpCommand();
-        /** @psalm-suppress InaccessibleMethod Protected methods as class based */
         $parser = $this->help->buildOptionParser($parser);
         $parser
             ->setDescription(
diff --git a/src/Command/TestCommand.php b/src/Command/TestCommand.php
index e39a3067..dd5e6c30 100644
--- a/src/Command/TestCommand.php
+++ b/src/Command/TestCommand.php
@@ -446,7 +446,6 @@ public function generateFixtureList(Table|Controller $subject): array
             $this->_processController($subject);
         }
 
-        /** @psalm-suppress RedundantFunctionCall */
         return array_values($this->_fixtures);
     }