diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9845ba9b3..d09d2b01e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,7 +78,6 @@ before_script:
   # Set some options and environment for CI
   - source tools/ci/configure_ci_environment.sh
   - *setup_tools_unless_target_test
-
   - *fetch_submodules
 
 # used for check scripts which we want to run unconditionally
@@ -117,6 +116,13 @@ before_script:
   dependencies: []
   extends: .before_script_lesser
 
+.python_lint_template:
+  stage: pre_check
+  image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
+  tags:
+    - host_test
+  dependencies: []
+
 .macos_build_template:
   stage: build
   tags:
diff --git a/tools/ci/config/pre_check.yml b/tools/ci/config/pre_check.yml
index 76cd1cbdc..00eb4922f 100644
--- a/tools/ci/config/pre_check.yml
+++ b/tools/ci/config/pre_check.yml
@@ -54,7 +54,7 @@ check_examples_rom_header:
     - tools/ci/check_examples_rom_header.sh
 
 check_python_style:
-  extends: .check_job_template_with_filter
+  extends: .python_lint_template
   artifacts:
     when: on_failure
     paths: