diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
index 96b2679..d2a03af 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -10,6 +10,8 @@ on:
       - 'phpunit.xml.dist'
 
   push:
+    branches:
+      - master
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -28,4 +30,12 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1']
+        ['8.1', '8.2', '8.3']
+  psalm80:
+    uses: yiisoft/actions/.github/workflows/psalm.yml@master
+    with:
+      psalm-config: psalm80.xml
+      os: >-
+        ['ubuntu-latest']
+      php: >-
+        ['8.0']
diff --git a/composer.json b/composer.json
index c6c0ef3..7626b5e 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
         "rector/rector": "^1.0.0",
         "roave/infection-static-analysis-plugin": "^1.18",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.30|^5.6",
+        "vimeo/psalm": "^4.30|^5.21",
         "yiisoft/test-support": "^1.4"
     },
     "autoload": {
diff --git a/psalm.xml b/psalm.xml
index 796ae44..1e5dd14 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -15,6 +15,7 @@
     </projectFiles>
     <issueHandlers>
         <MixedAssignment errorLevel="suppress" />
+        <RiskyTruthyFalsyComparison errorLevel="suppress" />
         <InvalidThrow>
             <errorLevel type="suppress">
                 <referencedClass name="Psr\Container\ContainerExceptionInterface" />
diff --git a/psalm80.xml b/psalm80.xml
new file mode 100644
index 0000000..796ae44
--- /dev/null
+++ b/psalm80.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="1"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
+    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"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+    <issueHandlers>
+        <MixedAssignment errorLevel="suppress" />
+        <InvalidThrow>
+            <errorLevel type="suppress">
+                <referencedClass name="Psr\Container\ContainerExceptionInterface" />
+                <referencedClass name="Psr\Container\NotFoundExceptionInterface" />
+            </errorLevel>
+        </InvalidThrow>
+    </issueHandlers>
+</psalm>