diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88a24b8e7..a9aa2d484 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,10 +55,21 @@ style-check-diff:
   allow_failure: true
   script:
     - .gitlab-ci/run-style-check-diff.sh
+    - .gitlab-ci/run-check-todos.sh
+
+sh-and-py-check:
+  extends: .only-default
+  image: $DEBIAN_IMAGE
+  stage: style-check
+  allow_failure: false
+  script:
     - .gitlab-ci/run-shellcheck.sh
     - .gitlab-ci/run-black.sh
     - .gitlab-ci/run-flake8.sh
-    - .gitlab-ci/run-check-todos.sh
+  only:
+    changes:
+      - "**/*.py"
+      - "**/*.sh"
 
 fedora-x86_64:
   extends: