diff --git a/composer.json b/composer.json
index a4ac4f76ad7..10f880d615d 100644
--- a/composer.json
+++ b/composer.json
@@ -54,10 +54,9 @@
         "symfony/process": "^8.1",
         "symplify/easy-coding-standard": "^13.2.13",
         "symplify/phpstan-rules": "^14.13",
-        "tomasvotruba/class-leak": "^2.1",
+        "tomasvotruba/class-leak": "^2.2",
         "tomasvotruba/fast-unit": "^0.1",
         "tomasvotruba/type-coverage": "^2.3.6",
-        "tomasvotruba/unused-public": "^2.2",
         "tracy/tracy": "^2.12"
     },
     "replace": {
diff --git a/phpstan.neon b/phpstan.neon
index 6923a5ea250..741918ab41b 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,6 +1,7 @@
 includes:
     - vendor/symplify/phpstan-rules/config/symplify-rules.neon
     - vendor/symplify/phpstan-rules/config/rector-rules.neon
+    - vendor/tomasvotruba/class-leak/config/unused-public-extension.neon
 
 rules:
     - Rector\Utils\PHPStan\Rule\RegisterRelatedPolyfillRectorRule
@@ -58,7 +59,7 @@ parameters:
         narrow_param: true
         narrow_return: true
 
-    # see https://github.com/TomasVotruba/unused-public
+    # bundled in tomasvotruba/class-leak, see https://github.com/TomasVotruba/class-leak
     unused_public:
         methods: true
         properties: true