diff --git a/ci-templates/python.yml b/ci-templates/python.yml
index cdb6a09eb015e0dab66988fa2230bcb4c138a652..4a593b6a066e66b22aadab5fea7885b7caabaa7d 100644
--- a/ci-templates/python.yml
+++ b/ci-templates/python.yml
@@ -2,14 +2,16 @@
 .flake8_template:
   stage: build
   before_script: ${PYTHON_VERSION} -m pip -q install flake8
-  script: ${PYTHON_VERSION} -m flake8 --max-line-length 120 --statistics --show-source .
-
+  script: 
+  - find . -type f -executable -exec awk ' /^#!.*python/{print FILENAME}  {nextfile}' {} + > /tmp/shebang_python_files
+  - find . -type f -name "*.py" > /tmp/extension_python_files
+  - sort /tmp/extension_python_files /tmp/shebang_python_files | uniq | xargs ${PYTHON_VERSION} -m flake8 --max-line-length 120 --statistics --show-source
 
 .flake8_extended_template:
+  extends: .flake8_template
   stage: .post
   before_script:
     - ${PYTHON_VERSION} -m pip install flake8 flake8-isort flake8-builtins flake8-eradicate flake8-functions-names flake8-return flake8-functions
-  script: ${PYTHON_VERSION} -m flake8 --max-line-length 120 --statistics --show-source .
   allow_failure: true
 
 .security_template: