diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b050623d0..d2ceb6c2f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -79,17 +79,18 @@ jobs:
         php-version: '7.4'
         extensions: mbstring, intl
         coverage: none
+        tools: vimeo/psalm:4.23, phpstan:1.8, cs2pr
 
     - name: Composer Install
-      run: composer require --dev cakephp/cakephp-codesniffer:^4.1 psalm/phar:~4.19 phpstan/phpstan:~1.4
+      run: composer require --dev cakephp/cakephp-codesniffer:^4.1
 
     - name: Run phpcs
-      run: vendor/bin/phpcs --report=checkstyle --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/
+      run: vendor/bin/phpcs --report=checkstyle --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/ | cs2pr
 
     - name: Run psalm
-      if: failure() || success()
-      run: vendor/bin/psalm.phar --output-format=github
+      if: always()
+      run: psalm --output-format=github
 
     - name: Run phpstan
-      if: failure() || success()
-      run: vendor/bin/phpstan.phar analyse --error-format=github
+      if: always()
+      run: phpstan analyse --error-format=github
diff --git a/composer.json b/composer.json
index 8c128aae3..c4487516c 100644
--- a/composer.json
+++ b/composer.json
@@ -68,5 +68,11 @@
         "issues": "https://github.com/FriendsOfCake/crud/issues",
         "wiki": "http://crud.readthedocs.org/en/latest/",
         "irc": "irc://irc.freenode.org/friendsofcake"
+    },
+    "config": {
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }