diff --git a/.gitattributes b/.gitattributes
index feaef8927..1160f47b7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,3 +8,8 @@ tests export-ignore
 docs export-ignore
 Makefile export-ignore
 phpunit.xml.dist export-ignore
+phpstan.neon.dist export-ignore
+phpstan-baseline.neon export-ignore
+phpstan-console-application.php export-ignore
+psalm.xml export-ignore
+psalm-baseline.xml export-ignore
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 2b69ff79c..0e4289094 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -74,7 +74,7 @@ jobs:
 
             - name: Remove dev dependencies not compatible with Symfony 6
               if: matrix.symfony-require == '6.0.*'
-              run: composer remove psalm/plugin-symfony symfony/maker-bundle symfony/panther --dev --no-update --no-interaction
+              run: composer remove psalm/plugin-symfony --dev --no-update --no-interaction
 
             - name: Install Composer dependencies (${{ matrix.dependencies }})
               uses: ramsey/composer-install@v1
diff --git a/Makefile b/Makefile
index 68bf739f8..ff76e5a82 100644
--- a/Makefile
+++ b/Makefile
@@ -92,3 +92,11 @@ coverage:
 docs:
 	cd docs && sphinx-build -W -b dirhtml -d _build/doctrees . _build/html
 .PHONY: docs
+
+phpstan:
+	vendor/bin/phpstan --memory-limit=1G analyse
+.PHONY: phpstan
+
+psalm:
+	vendor/bin/psalm
+.PHONY: psalm
diff --git a/README.md b/README.md
index 84cee0d7a..706003bf3 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ This bundle provides a Site and Page management through container and block serv
 
 [![Latest Stable Version](https://poser.pugx.org/sonata-project/page-bundle/v/stable)](https://packagist.org/packages/sonata-project/page-bundle)
 [![Latest Unstable Version](https://poser.pugx.org/sonata-project/page-bundle/v/unstable)](https://packagist.org/packages/sonata-project/page-bundle)
+[![Psalm Type Coverage][shepherd_stable_badge]][shepherd_stable_link]
 [![License](https://poser.pugx.org/sonata-project/page-bundle/license)](https://packagist.org/packages/sonata-project/page-bundle)
 
 [![Total Downloads](https://poser.pugx.org/sonata-project/page-bundle/downloads)](https://packagist.org/packages/sonata-project/page-bundle)
@@ -44,6 +45,8 @@ This package is available under the [MIT license](LICENSE).
 [coverage_stable_link]: https://codecov.io/gh/sonata-project/SonataPageBundle/branch/3.x
 [coverage_unstable_badge]: https://codecov.io/gh/sonata-project/SonataPageBundle/branch/4.x/graph/badge.svg
 [coverage_unstable_link]: https://codecov.io/gh/sonata-project/SonataPageBundle/branch/4.x
+[shepherd_stable_badge]: https://shepherd.dev/github/sonata-project/SonataPageBundle/coverage.svg
+[shepherd_stable_link]: https://shepherd.dev/github/sonata-project/SonataPageBundle
 [documentation_stable_badge]: https://readthedocs.org/projects/sonatapagebundle/badge/?version=3.x
 [documentation_stable_link]: https://docs.sonata-project.org/projects/SonataPageBundle/en/3.x/?badge=3.x
 [documentation_unstable_badge]: https://readthedocs.org/projects/sonatapagebundle/badge/?version=4.x