diff --git a/.gitlab/ci/ci-templates.gitlab-ci.yml b/.gitlab/ci/ci-templates.gitlab-ci.yml
deleted file mode 100644
index ab7a3c0bacfa049b4da77cc07f63cf34f5c3b632..0000000000000000000000000000000000000000
--- a/.gitlab/ci/ci-templates.gitlab-ci.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-templates-shellcheck:
-  extends:
-    - .ci-templates:rules:shellcheck
-    - .default-before_script
-    - .default-retry
-    - .ruby-cache
-    - .use-pg15
-  stage: test
-  needs:
-    - setup-test-env
-  script:
-    # Try bullseye (0.7) first and then bookworm (0.9)
-    - apt update && apt install -y shellcheck=0.7.1-1+deb11u1 || apt install -y shellcheck=0.9.0-1
-    - bundle exec scripts/lint_templates_bash.rb
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 7e5992ab9f4df6626f5244561fa02a652e895161..6417258c2f30330464c26469c58b5d5cc9df48d1 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -191,6 +191,7 @@
   - "{,ee/,jh/}{bin,config}/**/*.rb"
 
 .ci-templates-patterns: &ci-templates-patterns
+  - ".gitlab/ci/static-analysis.gitlab-ci.yml"
   - "lib/gitlab/ci/templates/**/*.gitlab-ci.yml"
 
 .ci-qa-patterns: &ci-qa-patterns
diff --git a/.gitlab/ci/static-analysis.gitlab-ci.yml b/.gitlab/ci/static-analysis.gitlab-ci.yml
index b57fadee49eff9101e2e64ac8797194f5bde4090..c3daaca2e7c00db6be33fe4c4454e72461962754 100644
--- a/.gitlab/ci/static-analysis.gitlab-ci.yml
+++ b/.gitlab/ci/static-analysis.gitlab-ci.yml
@@ -200,6 +200,20 @@ audit-event-types-verify:
   script:
     - bundle exec rake gitlab:audit_event_types:check_docs
 
+templates-shellcheck:
+  extends:
+    - .ci-templates:rules:shellcheck
+    - .default-before_script
+    - .default-retry
+    - .ruby-cache
+    - .use-pg15
+  stage: lint
+  needs:
+    - setup-test-env
+  script:
+    - apt update && apt install -y shellcheck=0.9.0-1
+    - bundle exec scripts/lint_templates_bash.rb
+
 ping-appsec-for-sast-findings:
   stage: lint
   image: alpine:latest