diff --git a/.github/workflows/shellcheck.yaml b/.github/workflows/shellcheck.yaml
index bd8d999e8880..c0ccbb329613 100644
--- a/.github/workflows/shellcheck.yaml
+++ b/.github/workflows/shellcheck.yaml
@@ -24,13 +24,10 @@ jobs:
     name: Shellcheck
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    - name: Run ShellCheck
-      uses: ludeeus/action-shellcheck@00b27aa7cb85167568cb48a3838b75f4265f2bca # master
-      with:
-        severity: warning
-        check_together: 'yes'
-        disable_matcher: false
-        additional_files: build/reset build/sed-in-place
-        ignore: olm
-        format: gcc
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: install shellcheck
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y shellcheck
+      - name: Run ShellCheck
+        run: make shellcheck
diff --git a/Makefile b/Makefile
index 882df39e5458..64ee14c20e41 100644
--- a/Makefile
+++ b/Makefile
@@ -165,6 +165,10 @@ yamllint:
 pylint:
 	pylint $(shell find $(ROOT_DIR)  -name '*.py') -E
 
+.PHONY: shellcheck
+shellcheck:
+	shellcheck --severity=warning --format=gcc --shell=bash $(shell find $(ROOT_DIR) -type f -name '*.sh') build/reset build/sed-in-place
+
 gen.codegen: codegen
 codegen: ${CODE_GENERATOR} ## Run code generators.
 	@build/codegen/codegen.sh