diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml
index 2146b27b94..f30475a76d 100644
--- a/.github/workflows/test-coding-standards.yml
+++ b/.github/workflows/test-coding-standards.yml
@@ -57,14 +57,5 @@ jobs:
       - name: Install dependencies
         run: composer update --ansi --no-interaction
 
-      - name: Run lint on `app/`, `admin/`, `public/`
-        run: utils/vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.php-cs-fixer.no-header.php --using-cache=no --diff
-
-      - name: Run lint on `system/`, `utils/`, and root PHP files
-        run: utils/vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --using-cache=no --diff
-
-      - name: Run lint on `tests`
-        run: utils/vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.php-cs-fixer.tests.php --using-cache=no --diff
-
-      - name: Run lint on `user_guide_src/source/`
-        run: utils/vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.php-cs-fixer.user-guide.php --using-cache=no --diff
+      - name: Run lint
+        run: composer cs
diff --git a/admin/pre-commit b/admin/pre-commit
index 107adc35a3..19bec4f472 100644
--- a/admin/pre-commit
+++ b/admin/pre-commit
@@ -24,39 +24,10 @@ if [ "$FILES" != "" ]; then
     echo "Running PHP CS Fixer..."
 
     # Run on whole codebase to skip on unnecessary filtering
-    # Run first on app, admin, public
-    if [ -d /proc/cygdrive ]; then
-        ./utils/vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.php-cs-fixer.no-header.php
-    else
-        php ./utils/vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.php-cs-fixer.no-header.php
-    fi
+    composer cs
 
     if [ $? != 0 ]; then
-        echo "Files in app, admin, or public are not following the coding standards. Please fix them before commit."
-        exit 1
-    fi
-
-    # Next, run on system, tests, utils, and root PHP files
-    if [ -d /proc/cygdrive ]; then
-        ./utils/vendor/bin/php-cs-fixer fix --verbose --dry-run --diff
-    else
-        php ./utils/vendor/bin/php-cs-fixer fix --verbose --dry-run --diff
-    fi
-
-    if [ $? != 0 ]; then
-        echo "Files in system, tests, utils, or root are not following the coding standards. Please fix them before commit."
-        exit 1
-    fi
-
-    # Next, run on user_guide_src/source PHP files
-    if [ -d /proc/cygdrive ]; then
-        ./utils/vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.php-cs-fixer.user-guide.php
-    else
-        php ./utils/vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.php-cs-fixer.user-guide.php
-    fi
-
-    if [ $? != 0 ]; then
-        echo "Files in user_guide_src/source are not following the coding standards. Please fix them before commit."
+        echo "There are PHP files which are not following the coding standards. Please fix them before commit."
         exit 1
     fi
 fi