diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb7d28f7425802b265e3bd6fcd7fccef3a79b960..51fdb789ef3c06cc396ded893b238b82bf844dfc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,18 +31,6 @@ flake8:
             - templates/python/code_quality/flake8/**/*
             - tests/flake8_project/**/*
 
-
-flake8_2:
-    stage: templates
-    variables:
-        PROJECT_PATH: "tests/flake8_project"
-    only:
-        changes:
-            - .gitlab-ci.yml
-            - pyproject.toml
-            - templates/python/code_quality/flake8/**/*
-            - tests/flake8_project/**/*
-
 #flake8-plugin:
 #    stage: templates
 #    variables:
diff --git a/templates/python/code_quality/flake8/flake8.yml b/templates/python/code_quality/flake8/flake8.yml
index 6cf80e1dcbf9fe1056a77511c39d41193bad98ff..983897a34e82314d11f50eb437c0612542ceb9d2 100644
--- a/templates/python/code_quality/flake8/flake8.yml
+++ b/templates/python/code_quality/flake8/flake8.yml
@@ -2,11 +2,10 @@ include:
   - remote: 'https://api.r2devops.io/job/r/gitlab/dorianturba/r2devops_catalog/python_install@latest.yaml'
 
 flake8:
-    image: python:${IMAGE_TAG}
+    extends:
+        - .python_install
     stage: code_quality
     variables:
-        IMAGE_TAG: !reference [.python_install, variables, IMAGE_TAG]
-        PROJECT_PATH: "."
         PYTHON_SETUP: "pip install flake8"
     script:
         - !reference [.python_install, script]
diff --git a/templates/python/code_quality/flake8/flake8_2.yml b/templates/python/code_quality/flake8/flake8_2.yml
deleted file mode 100644
index 9e41fea02c1368120f01b4dabbab2ad43f8398c0..0000000000000000000000000000000000000000
--- a/templates/python/code_quality/flake8/flake8_2.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-include:
-  - local: 'templates/python/partial/python_install_2.yml'
-
-flake8_2:
-    extends:
-        - .python_install
-    stage: code_quality
-    variables:
-        PYTHON_SETUP: "pip install flake8"
-    script:
-        - !reference [.python_install, script]
-        - flake8 ${PROJECT_PATH} -v
-    only:
-        changes:
-            - ${PROJECT_PATH}/**/*.py
-            - .gitlab-ci.yml
-            - ${PROJECT_PATH}/pyproject.toml
-            - ${PROJECT_PATH}/.flake8
diff --git a/templates/python/partial/python_install.yml b/templates/python/partial/python_install.yml
index c815a77d616d71dc23ddf6ad9192aa78aaf88f00..0df57f51e07c12287adf176d97186d49f8ca4d2f 100644
--- a/templates/python/partial/python_install.yml
+++ b/templates/python/partial/python_install.yml
@@ -1,8 +1,10 @@
 .python_install:
+    image: python:${IMAGE_TAG}
     variables:
         IMAGE_TAG: "latest"
         PROJECT_PATH: "."
-        PYTHON_SETUP: "pip install -r ${PROJECT_PATH}/requirements.txt"
+        REQUIREMENTS_FILE: "requirements.txt"
+        PYTHON_SETUP: "pip install -r ${PROJECT_PATH}/${REQUIREMENTS_FILE}"
     script:
         - python --version  # Debug
         - python -m venv venv --upgrade-deps || python -m venv venv  # upgrade-deps is not supported before 3.9
diff --git a/templates/python/partial/python_install_2.yml b/templates/python/partial/python_install_2.yml
deleted file mode 100644
index b3315a74cc9cb5a9b447808d3504705bc301a918..0000000000000000000000000000000000000000
--- a/templates/python/partial/python_install_2.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-.python_install:
-    image: python:${IMAGE_TAG}
-    variables:
-        IMAGE_TAG: "latest"
-        PROJECT_PATH: "."
-        PYTHON_SETUP: "pip install -r ${PROJECT_PATH}/requirements.txt"
-    script:
-        - python --version  # Debug
-        - python -m venv venv --upgrade-deps || python -m venv venv  # upgrade-deps is not supported before 3.9
-        - source venv/bin/activate
-        - ${PYTHON_SETUP}