diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cff5349f38eb02327cbd3352e9d8cf2c92c2d714..de70d1f9cd4cbe40caf966569ac7633ac4b2b077 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,18 +1,18 @@
 stages:
-    - code_quality
-    - test
+    - template_testing
 
 include:
     - local: 'templates/python/testing/pytest/pytest.yml'
     - local: 'templates/python/code_quality/flake8/flake8.yml'
 
 pytest:
+    stage: template_testing
     variables:
         PROJECT_PATH: "tests/pytest_project"
         PYTHON_SETUP: "pip install ${PROJECT_PATH} pytest"
 
 flake8:
+    stage: template_testing
     variables:
-        IMAGE_TAG: "latest"
         PROJECT_PATH: "tests/flake8_project"
         PYTHON_SETUP: "pip install ${PROJECT_PATH} flake8"