diff --git a/.gitignore b/.gitignore
index 8fbc59c4b5..e78eb7dc02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@ config/bash.env
 .idea/sonarlint.xml
 
 .idea/sonarlint-state.xml
+
+phpstan/phpstan-baseline-pr.neon
diff --git a/Makefile b/Makefile
index 6f2e4b56b4..4e2f71ae2f 100644
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,16 @@ copyconf:
 phpstan:
 		@docker-compose exec web vendor/bin/phpstan analyse -c phpstan.neon
 
+phpstanpr:
+		@git checkout --detach master
+		@make rundev
+		@docker-compose exec web vendor/bin/phpstan analyse -c phpstan.neon --generate-baseline phpstan/phpstan-baseline-pr.neon
+		@git checkout -
+		@docker cp gewisweb_web_1:/code/phpstan/phpstan-baseline-pr.neon ./phpstan/phpstan-baseline-pr.neon
+		@make rundev
+		@docker cp ./phpstan/phpstan-baseline-pr.neon gewisweb_web_1:/code/phpstan/phpstan-baseline.neon
+		@docker-compose exec web vendor/bin/phpstan analyse -c phpstan.neon
+
 phpcs:
 		@vendor/bin/phpcs -p --standard=PSR1,PSR12 --extensions=php,dist module config
 
diff --git a/phpstan.neon b/phpstan.neon
index f991f37386..fa83cc014e 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,14 +1,14 @@
 includes:
-    - phpstan-baseline.neon
+    - phpstan/phpstan-baseline.neon
 
 parameters:
     level: 3
     bootstrapFiles:
         - bootstrap.php
     laminasframework:
-       serviceManagerLoader: phpstan-sm.php
+       serviceManagerLoader: phpstan/phpstan-sm.php
     doctrine:
-        objectManagerLoader: phpstan-om.php
+        objectManagerLoader: phpstan/phpstan-om.php
     paths:
         - config
         - bootstrap.php
diff --git a/phpstan-baseline.neon b/phpstan/phpstan-baseline.neon
similarity index 100%
rename from phpstan-baseline.neon
rename to phpstan/phpstan-baseline.neon
diff --git a/phpstan-om.php b/phpstan/phpstan-om.php
similarity index 100%
rename from phpstan-om.php
rename to phpstan/phpstan-om.php
diff --git a/phpstan-sm.php b/phpstan/phpstan-sm.php
similarity index 100%
rename from phpstan-sm.php
rename to phpstan/phpstan-sm.php