diff --git a/composer.json b/composer.json
index 81016de84ce..3216b935dea 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,7 @@
     },
     "require-dev": {
         "doctrine/coding-standard": "9.0.0",
-        "jetbrains/phpstorm-stubs": "2021.1",
+        "jetbrains/phpstorm-stubs": "2022.1",
         "phpstan/phpstan": "1.5.3",
         "phpstan/phpstan-strict-rules": "^1.1",
         "phpunit/phpunit": "9.5.16",
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 5e10caf076a..8679774429e 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -86,6 +86,12 @@ parameters:
             paths:
                 - src/Driver/OCI8/Statement.php
 
+        # https://github.com/phpstan/phpstan-src/pull/1214
+        -
+            message: '~^Expression on left side of \?\? is not nullable\.$~'
+            paths:
+                - src/Driver/IBMDB2/Connection.php
+
         # TODO: check for null after calling Connection::getDatabase()
         -
             message: '~Parameter.*\$database of method.*expects string, string\|null given\.~'
diff --git a/psalm.xml.dist b/psalm.xml.dist
index f85300506fd..fdbb23a7545 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -253,10 +253,6 @@
         </DeprecatedProperty>
         <DocblockTypeContradiction>
             <errorLevel type="suppress">
-                <!--
-                    Requires a release of https://github.com/JetBrains/phpstorm-stubs/pull/766
-                -->
-                <file name="src/Driver/Mysqli/Result.php"/>
                 <!--
                     These issues can be mostly divided in the following categories:
                       1. Union types not supported at the language level (require dropping PHP 7 support)
@@ -439,19 +435,15 @@
                 <file name="tests/Platforms/AbstractMySQLPlatformTestCase.php"/>
             </errorLevel>
         </TooManyArguments>
-        <UndefinedConstant>
-            <errorLevel type="suppress">
-                <!--
-                    Requires a release of
-                    https://github.com/JetBrains/phpstorm-stubs/pull/732
-                -->
-                <file name="tests/Driver/PDO/PgSQL/DriverTest.php" />
-            </errorLevel>
-        </UndefinedConstant>
         <UndefinedDocblockClass>
             <errorLevel type="suppress">
                 <!-- See https://github.com/vimeo/psalm/issues/5472 -->
                 <referencedClass name="Doctrine\DBAL\Portability\T"/>
+                <!--
+                    The OCI-Lob class was renamed to OCILob in PHP 8 while Psalm infers PHP 7.3 from composer.json
+                    and may not properly interpret the LanguageLevelTypeAware annotation from the stubs.
+                -->
+                <referencedClass name="OCILob"/>
             </errorLevel>
         </UndefinedDocblockClass>
         <InvalidReturnStatement>
diff --git a/src/Driver/IBMDB2/Connection.php b/src/Driver/IBMDB2/Connection.php
index 4f2a2926696..aca2a02ce92 100644
--- a/src/Driver/IBMDB2/Connection.php
+++ b/src/Driver/IBMDB2/Connection.php
@@ -108,7 +108,7 @@ public function lastInsertId($name = null)
             );
         }
 
-        return db2_last_insert_id($this->connection);
+        return db2_last_insert_id($this->connection) ?? false;
     }
 
     public function beginTransaction(): bool