diff --git a/ci-templates/auto-rules/no-default.yml b/ci-templates/auto-rules/no-default.yml
index 4921c978f900fd4012d63f9ec282777de455f08d..4d90ee1e7c164ff53259a7bec8750dd85a040513 100644
--- a/ci-templates/auto-rules/no-default.yml
+++ b/ci-templates/auto-rules/no-default.yml
@@ -91,11 +91,6 @@ py2-flake8:
     - .py2_rules
     - .py2-flake8
 
-py2-flake8_extended:
-  extends:
-    - .py2_rules
-    - .py2-flake8_extended
-
 ddeploy:
   extends: .ddeploy
   rules:
diff --git a/ci-templates/python.yml b/ci-templates/python.yml
index 61d476aadbad4820c1325ea65af993b783e55768..e900b5a2c1f6f1fbb9f2f40f00d218f0e3cfcab4 100644
--- a/ci-templates/python.yml
+++ b/ci-templates/python.yml
@@ -8,9 +8,7 @@
 .flake8_extended_template:
   stage: .post
   before_script:
-    - ${PYTHON_VERSION} -m pip install flake8 flake8-isort flake8-builtins
-    # The following flake8 extensions only work on python3
-    - ${PYTHON_VERSION} -m pip install flake8-eradicate flake8-functions-names flake8-return flake8-functions || true
+    - ${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
 
@@ -49,11 +47,6 @@
     - .flake8_extended_template
     - .py3_template
 
-.py2-flake8_extended:
-  extends:
-    - .flake8_extended_template
-    - .py2_template
-
 .py3-security:
   extends:
     - .security_template