diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 24b778b..798f65e 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -54,9 +54,8 @@ jobs:
         with:
           # Should be the higest supported version, so we can use the newest tools
           php-version: '8.4'
-          tools: composer, composer-require-checker, composer-unused, phpcs, psalm
-          # optional performance gain for psalm: opcache
-          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, opcache, openssl, pcre, posix, spl, xml
+          tools: composer, composer-require-checker, composer-unused, phpcs, phpstan
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, spl, xml
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
@@ -88,27 +87,13 @@ jobs:
       - name: PHP Code Sniffer
         run: phpcs
 
-      - name: Psalm
-        continue-on-error: true
-        run: |
-          psalm -c psalm.xml \
-          --show-info=true \
-          --shepherd \
-          --php-version=${{ steps.setup-php.outputs.php-version }}
-
-      - name: Psalm (testsuite)
+      - name: PHPStan
         run: |
-          psalm -c psalm-dev.xml \
-          --show-info=true \
-          --shepherd \
-          --php-version=${{ steps.setup-php.outputs.php-version }}
+          vendor/bin/phpstan analyze -c phpstan.neon --debug
 
-      - name: Psalter
+      - name: PHPStan (testsuite)
         run: |
-          psalm --alter \
-          --issues=UnnecessaryVarAnnotation \
-          --dry-run \
-          --php-version=${{ steps.setup-php.outputs.php-version }}
+          vendor/bin/phpstan analyze -c phpstan-dev.neon --debug
 
   security:
     name: Security checks
diff --git a/phpstan-dev.neon b/phpstan-dev.neon
new file mode 100644
index 0000000..4d29b8b
--- /dev/null
+++ b/phpstan-dev.neon
@@ -0,0 +1,4 @@
+parameters:
+  level: 9
+  paths:
+    - tests
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 0000000..db37782
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,4 @@
+parameters:
+  level: 6
+  paths:
+    - src
diff --git a/psalm-dev.xml b/psalm-dev.xml
deleted file mode 100644
index 6116331..0000000
--- a/psalm-dev.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    name="SimpleSAMLphp testsuite"
-    useDocblockTypes="true"
-    errorLevel="4"
-    reportMixedIssues="false"
-    hideExternalErrors="true"
-    allowStringToStandInForClass="true"
->
-    <projectFiles>
-        <directory name="tests" />
-
-        <!-- Ignore certain directories -->
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
-    </projectFiles>
-
-    <issueHandlers>
-        <!-- Ignore UnresolvableInclude on CLI-scripts -->
-        <UnresolvableInclude>
-            <errorLevel type="suppress">
-                <file name="tests/bootstrap.php" />
-            </errorLevel>
-        </UnresolvableInclude>
-    </issueHandlers>
-</psalm>
diff --git a/psalm.xml b/psalm.xml
deleted file mode 100644
index 10072a2..0000000
--- a/psalm.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    name="SimpleSAMLphp authCrypt module"
-    useDocblockTypes="true"
-    errorLevel="2"
-    reportMixedIssues="false"
->
-    <projectFiles>
-        <directory name="src" />
-    </projectFiles>
-
-    <issueHandlers>
-        <LessSpecificReturnType errorLevel="info" />
-
-        <!-- level 3 issues - slightly lazy code writing, but probably low false-negatives -->
-        <DeprecatedMethod errorLevel="info" />
-
-        <MissingClosureReturnType errorLevel="info" />
-        <MissingReturnType errorLevel="info" />
-        <MissingPropertyType errorLevel="info" />
-        <InvalidDocblock errorLevel="info" />
-
-        <PropertyNotSetInConstructor errorLevel="info" />
-        <MissingConstructor errorLevel="info" />
-        <MissingClosureParamType errorLevel="info" />
-        <MissingParamType errorLevel="info" />
-        <UnusedClass errorLevel="info" />
-        <PossiblyUnusedMethod errorLevel="info" />
-    </issueHandlers>
-</psalm>
diff --git a/src/Auth/Source/Hash.php b/src/Auth/Source/Hash.php
index 0c44d77..e0914d3 100644
--- a/src/Auth/Source/Hash.php
+++ b/src/Auth/Source/Hash.php
@@ -26,7 +26,7 @@ class Hash extends UserPassBase
      * Our users, stored in an associative array. The key of the array is "<username>:<passwordhash>",
      * while the value of each element is a new array with the attributes for each user.
      *
-     * @var array
+     * @var array<string, array>
      */
     private array $users;
 
@@ -34,8 +34,8 @@ class Hash extends UserPassBase
     /**
      * Constructor for this authentication source.
      *
-     * @param array $info Information about this authentication source.
-     * @param array $config Configuration.
+     * @param array<string, mixed> $info Information about this authentication source.
+     * @param array<string, mixed> $config Configuration.
      *
      * @throws \Exception in case of a configuration error.
      */
@@ -87,7 +87,7 @@ public function __construct(array $info, array $config)
      * @param string $username The username the user wrote.
      * @param string $password The password the user wrote.
      *
-     * @return array  Associative array with the users attributes.
+     * @return array<string, array> Associative array with the users attributes.
      *
      * @throws \SimpleSAML\Error\Error if authentication fails.
      */