diff --git a/.github/workflows/test-chart.yaml b/.github/workflows/test-chart.yaml
index e8aca1bcd1..2e284f0a83 100644
--- a/.github/workflows/test-chart.yaml
+++ b/.github/workflows/test-chart.yaml
@@ -38,8 +38,8 @@ jobs:
       - name: Install dependencies
         run: pip install pre-commit
 
-      - name: Run shellcheck linter
-        run: pre-commit run --all --config .pre-commit-config-shellcheck.yaml
+      - name: Run all stages including shellcheck (disabled by default)
+        run: pre-commit run --all --hook-stage manual
 
   lint_and_validate_rendered_templates:
     runs-on: ubuntu-22.04
diff --git a/.pre-commit-config-shellcheck.yaml b/.pre-commit-config-shellcheck.yaml
deleted file mode 100644
index 3e0be7f9d7..0000000000
--- a/.pre-commit-config-shellcheck.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# See .pre-commit-config.yaml for more details.
-repos:
-  - repo: https://github.com/gruntwork-io/pre-commit
-    rev: v0.1.15
-    hooks:
-      - id: shellcheck
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3eb666daa6..005c11936c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -70,6 +70,14 @@ repos:
     hooks:
       - id: flake8
 
+  - repo: https://github.com/gruntwork-io/pre-commit
+    rev: v0.1.22
+    hooks:
+      # This requires shellcheck to be installed manually so is disabled by default
+      - id: shellcheck
+        stages:
+          - manual
+
 # pre-commit.ci config reference: https://pre-commit.ci/#configuration
 ci:
   autoupdate_schedule: monthly