diff --git a/phpstan-baseline-gte-8.0.neon b/phpstan-baseline-gte-8.0.neon
index c3cde9014c..3130a18ada 100644
--- a/phpstan-baseline-gte-8.0.neon
+++ b/phpstan-baseline-gte-8.0.neon
@@ -71,7 +71,7 @@ parameters:
 			path: src/bundle/Core/Imagine/IORepositoryResolver.php
 
 		-
-			message: "#^Method Ibexa\\\\Bundle\\\\Core\\\\URLChecker\\\\Handler\\\\HTTPHandler\\:\\:createCurlHandlerForUrl\\(\\) should return resource but returns CurlHandle\\.$#"
+			message: "#^Method Ibexa\\\\Bundle\\\\Core\\\\URLChecker\\\\Handler\\\\HTTPHandler\\:\\:createCurlHandlerForUrl\\(\\) should return resource but returns \\(CurlHandle\\|false\\)\\.$#"
 			count: 1
 			path: src/bundle/Core/URLChecker/Handler/HTTPHandler.php
 
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index bda707eb66..6c2db188d9 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -9675,11 +9675,6 @@ parameters:
 			count: 2
 			path: src/lib/FieldType/Keyword/KeywordStorage/Gateway/DoctrineStorage.php
 
-		-
-			message: "#^Cannot call method fetchFirstColumn\\(\\) on Doctrine\\\\DBAL\\\\ForwardCompatibility\\\\Result\\|int\\|string\\.$#"
-			count: 1
-			path: src/lib/FieldType/Keyword/KeywordStorage/Gateway/DoctrineStorage.php
-
 		-
 			message: "#^Method Ibexa\\\\Core\\\\FieldType\\\\Keyword\\\\KeywordStorage\\\\Gateway\\\\DoctrineStorage\\:\\:assignKeywords\\(\\) has parameter \\$keywordMap with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -10275,11 +10270,6 @@ parameters:
 			count: 3
 			path: src/lib/FieldType/Url/UrlStorage/Gateway/DoctrineStorage.php
 
-		-
-			message: "#^Cannot call method fetchFirstColumn\\(\\) on Doctrine\\\\DBAL\\\\ForwardCompatibility\\\\Result\\|int\\|string\\.$#"
-			count: 1
-			path: src/lib/FieldType/Url/UrlStorage/Gateway/DoctrineStorage.php
-
 		-
 			message: "#^Method Ibexa\\\\Core\\\\FieldType\\\\Url\\\\UrlStorage\\\\Gateway\\\\DoctrineStorage\\:\\:getIdUrlMap\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -16430,11 +16420,6 @@ parameters:
 			count: 12
 			path: src/lib/Persistence/Legacy/Content/Location/Gateway/DoctrineDatabase.php
 
-		-
-			message: "#^Cannot call method fetchFirstColumn\\(\\) on Doctrine\\\\DBAL\\\\ForwardCompatibility\\\\Result\\|int\\|string\\.$#"
-			count: 1
-			path: src/lib/Persistence/Legacy/Content/Location/Gateway/DoctrineDatabase.php
-
 		-
 			message: "#^Method Ibexa\\\\Core\\\\Persistence\\\\Legacy\\\\Content\\\\Location\\\\Gateway\\\\DoctrineDatabase\\:\\:addSort\\(\\) has parameter \\$languageSettings with no value type specified in iterable type array\\.$#"
 			count: 1
diff --git a/phpunit.xml b/phpunit.xml
index b55dae9d52..cb60d982af 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -11,7 +11,7 @@
   >
   <php>
     <ini name="error_reporting" value="-1" />
-    <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[total]=576&amp;verbose=0"/>
+    <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[total]=631&amp;verbose=0"/>
   </php>
   <testsuites>
     <testsuite name="unit_core">