diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
deleted file mode 100644
index f7ed82bb7c4a..000000000000
--- a/.github/workflows/format.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-on:
-  push:
-  pull_request:
-
-name: "Format checks"
-permissions: {}
-
-jobs:
-  shellcheck:
-    name: Shellcheck
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Run ShellCheck
-        uses: ludeeus/action-shellcheck@master
-        with:
-          # shellcheck doesn't have good support for zsh, so we're ignoring this
-          ignore_paths: >-
-            *.zsh
-          severity: error
-
-      - name: Run ShellCheck Warnings
-        uses: ludeeus/action-shellcheck@master
-        with:
-          ignore_paths: >-
-            ./etc/completion.zsh
-            ./etc/completion.bash
-            ./etc/win-ci/cygwin-build-iconv.sh
-          severity: warning
diff --git a/.github/workflows/lint-shellcheck.yml b/.github/workflows/lint-shellcheck.yml
new file mode 100644
index 000000000000..8c732b7fb451
--- /dev/null
+++ b/.github/workflows/lint-shellcheck.yml
@@ -0,0 +1,27 @@
+on:
+  push:
+    paths:
+      - '**/*.{sh,bash,fish}'
+      - './bin/*'
+      - './scripts/git/pre-commit'
+      - './src/llvm/ext/find-llvm-config'
+      - '.github/workflows/lint-shellcheck.yml'
+  pull_request:
+    paths:
+      - '**/*.{sh,bash,fish}'
+      - './bin/*'
+      - './scripts/git/pre-commit'
+      - './src/llvm/ext/find-llvm-config'
+      - '.github/workflows/lint-shellcheck.yml'
+
+name: "Lint Shellcheck"
+permissions: {}
+
+jobs:
+  shellcheck:
+    name: Shellcheck
+    runs-on: ubuntu:24.04
+    steps:
+      - run: shellcheck --version
+      - uses: actions/checkout@v4
+      - run: make lint-shellcheck