diff --git a/grumphp.yml b/grumphp.yml
index c919aefb4..1c10a3e22 100644
--- a/grumphp.yml
+++ b/grumphp.yml
@@ -5,87 +5,16 @@ parameters:
   tasks.license.name: AGPL-3.0
   tasks.license.holder: Champs-Libres
   tasks.phpstan.configuration: phpstan.neon
-  tasks.phpstan.use_grumphp_paths: false
   tasks.phpstan.ignore_patterns:
-    - src/Bundle/ChillTaskBundle/migrations
-    - src/Bundle/ChillThirdPartyBundle/migrations
-    - src/Bundle/ChillPersonBundle/migrations
-    - src/Bundle/ChillMainBundle/migrations
-    - src/Bundle/ChillDocStoreBundle/migrations
-    - src/Bundle/ChillEventBundle/migrations
-    - src/Bundle/ChillActivityBundle/migrations
-    - src/Bundle/ChillCustomFieldsBundle/migrations
-    - src/Bundle/ChillReportBundle/migrations
-    - src/Bundle/ChillBudgetBundle/migrations
-
-    - src/Bundle/ChillTaskBundle/DataFixtures
-    - src/Bundle/ChillThirdPartyBundle/DataFixtures
-    - src/Bundle/ChillPersonBundle/DataFixtures
-    - src/Bundle/ChillMainBundle/DataFixtures
-    - src/Bundle/ChillDocStoreBundle/DataFixtures
-    - src/Bundle/ChillEventBundle/DataFixtures
-    - src/Bundle/ChillActivityBundle/DataFixtures
-    - src/Bundle/ChillCustomFieldsBundle/DataFixtures
-    - src/Bundle/ChillReportBundle/DataFixtures
-    - src/Bundle/ChillBudgetBundle/DataFixtures
-
-    - src/Bundle/ChillTaskBundle/Tests
-    - src/Bundle/ChillThirdPartyBundle/Tests
-    - src/Bundle/ChillPersonBundle/Tests
-    - src/Bundle/ChillMainBundle/Tests
-    - src/Bundle/ChillDocStoreBundle/Tests
-    - src/Bundle/ChillEventBundle/Tests
-    - src/Bundle/ChillActivityBundle/Tests
-    - src/Bundle/ChillCustomFieldsBundle/Tests
-    - src/Bundle/ChillReportBundle/Tests
-    - src/Bundle/ChillBudgetBundle/Tests
-
-    - src/Bundle/ChillTaskBundle/Resources
-    - src/Bundle/ChillThirdPartyBundle/Resources
-    - src/Bundle/ChillPersonBundle/Resources
-    - src/Bundle/ChillMainBundle/Resources
-    - src/Bundle/ChillDocStoreBundle/Resources
-    - src/Bundle/ChillEventBundle/Resources
-    - src/Bundle/ChillActivityBundle/Resources
-    - src/Bundle/ChillCustomFieldsBundle/Resources
-    - src/Bundle/ChillReportBundle/Resources
-    - src/Bundle/ChillBudgetBundle/Resources
-
-    - src/Bundle/ChillTaskBundle/Test
-    - src/Bundle/ChillThirdPartyBundle/Test
-    - src/Bundle/ChillPersonBundle/Test
-    - src/Bundle/ChillMainBundle/Test
-    - src/Bundle/ChillDocStoreBundle/Test
-    - src/Bundle/ChillEventBundle/Test
-    - src/Bundle/ChillActivityBundle/Test
-    - src/Bundle/ChillCustomFieldsBundle/Test
-    - src/Bundle/ChillReportBundle/Test
-    - src/Bundle/ChillBudgetBundle/Test
-
-    - src/Bundle/ChillTaskBundle/translations
-    - src/Bundle/ChillThirdPartyBundle/translations
-    - src/Bundle/ChillPersonBundle/translations
-    - src/Bundle/ChillMainBundle/translations
-    - src/Bundle/ChillDocStoreBundle/translations
-    - src/Bundle/ChillEventBundle/translations
-    - src/Bundle/ChillActivityBundle/translations
-    - src/Bundle/ChillCustomFieldsBundle/translations
-    - src/Bundle/ChillReportBundle/translations
-    - src/Bundle/ChillBudgetBundle/translations
-
-    - src/Bundle/ChillTaskBundle/config
-    - src/Bundle/ChillThirdPartyBundle/config
-    - src/Bundle/ChillPersonBundle/config
-    - src/Bundle/ChillMainBundle/config
-    - src/Bundle/ChillDocStoreBundle/config
-    - src/Bundle/ChillEventBundle/config
-    - src/Bundle/ChillActivityBundle/config
-    - src/Bundle/ChillCustomFieldsBundle/config
-    - src/Bundle/ChillReportBundle/config
-    - src/Bundle/ChillBudgetBundle/config
-
-    - docs/
-    - tests/
+    - /src\/Bundle\/(.*)\/migrations/
+    - /src\/Bundle\/(.*)\/Resources/
+    - /src\/Bundle\/(.*)\/Tests/
+    - /src\/Bundle\/(.*)\/Test/
+    - /src\/Bundle\/(.*)\/config/
+    - /src\/Bundle\/(.*)\/translations/
+    - /src\/Bundle\/(.*)\/DataFixtures/
+    - /^docs/
+    - /^tests/
   skip_tasks:
     - composer_require_checker
     - phpcsfixer
diff --git a/phpstan.neon b/phpstan.neon
index 096be4873..56dbf9cbc 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,17 +1,3 @@
 includes:
 	- phpstan-baseline.neon
 
-parameters:
-    level: 7
-    paths:
-        - src
-    excludePaths:
-        - src/Bundle/*/config/*
-        - src/Bundle/*/Test/*
-        - src/Bundle/*/Tests/*
-        - src/Bundle/*/migrations/*
-        - src/Bundle/*/translations/*
-        - src/Bundle/*/Resources/*
-        - docs/
-        - tests/
-