diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index ffa48903..9ec8ca15 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -9,7 +9,7 @@ on:
       - master
 
 jobs:
-  tests:
+  lint:
     name: "Lint"
 
     runs-on: ubuntu-latest
@@ -27,10 +27,12 @@ jobs:
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          coverage: "none"
+          php-version: "${{ matrix.php-version }}"
           extensions: "intl"
           ini-values: "memory_limit=-1, error_reporting=E_ALL, display_errors=On"
-          php-version: "${{ matrix.php-version }}"
+          coverage: "none"
+          tools: parallel-lint, cs2pr
 
       - name: "Lint PHP files"
-        run: "find src/ -type f -name '*.php' -print0 | xargs -0 -L1 -P4 -- php -l -f"
+        run: |
+          parallel-lint . --checkstyle --exclude vendor --show-deprecated | cs2pr
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2eef081..153be38e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 - Run PHPStan using the lowest and highest php version ([#811](https://github.com/jsonrainbow/json-schema/pull/811))
+### Fixed
+- Use parallel-lint and cs2pr for improved feedback on linting errors ([#812](https://github.com/jsonrainbow/json-schema/pull/812))
 
 ## [6.3.1] - 2025-03-18
 ### Fixed