diff --git a/.github/workflows/lint-format.yml b/.github/workflows/lint-format.yml
index 1e979312..f1d958d4 100644
--- a/.github/workflows/lint-format.yml
+++ b/.github/workflows/lint-format.yml
@@ -45,7 +45,7 @@ jobs:
         run: npm ci
 
       - name: Run ESLint
-        run: npm run lint
+        run: npm run lint:check
 
       - name: Check Prettier formatting
         run: npm run format:check
diff --git a/.prettierignore b/.prettierignore
index 07be4a24..5243dc27 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -18,5 +18,14 @@ npm-shrinkwrap.json
 Metrics/config/config.js
 SpellChecker/sources/server.js
 
-# Config JSON files (tab-indented)
-Common/config/**/*.json
+# Patterns merged from .gitignore
+.idea/
+Common/config/local.json
+license.lic
+App_Data/
+FileConverter/bin
+DocService/npm-debug.log
+/Gruntfile.js.out
+local-development-*.json
+*.pyc
+run-develop-local.py
diff --git a/package.json b/package.json
index 0c9032cb..14324d01 100644
--- a/package.json
+++ b/package.json
@@ -23,12 +23,12 @@
     "prettier": "3.4.2"
   },
   "scripts": {
-    "lint": "eslint .",
+    "lint:check": "eslint .",
     "lint:fix": "eslint . --fix",
-    "format": "prettier . --write",
+    "format:fix": "prettier . --write",
     "format:check": "prettier . --check",
-    "code:check": "run-s lint format:check",
-    "code:fix": "run-s lint:fix format",
+    "code:check": "run-s lint:check format:check",
+    "code:fix": "run-s lint:fix format:fix",
     "prepare": "husky",
     "perf-expired": "cd ./DocService&& cross-env NODE_ENV=development-windows NODE_CONFIG_DIR=../Common/config node ../tests/perf/checkFileExpire.js",
     "perf-exif": "cd ./DocService&& cross-env NODE_ENV=development-windows NODE_CONFIG_DIR=../Common/config node ../tests/perf/fixImageExifRotation.js",