diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c05d16df2b05e3b8073bbf717c04502eff7bd177..46cf0a632f08de2350d78a21b631318ac67f262f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,8 +30,9 @@ services:
 
 stages:
   - build
-  - prepare_configs
+  - prepare_config_unit_tests
   - test_and_qa
+  - prepare_config_deployment
   - deploy_to_staging
   - test_staging
   - deploy_to_prod_hx
@@ -96,7 +97,7 @@ pylint:
 ### Tests
 ### ---------------------------------------------------------------------------------------------------------------------
 prepare_config_unit_tests:
-  stage: prepare_configs
+  stage: prepare_config_unit_tests
   image:
     name: alpine/git
     entrypoint: ["/bin/sh", "-c"]
@@ -125,7 +126,7 @@ unit_tests:
 ## Deployment to staging
 ## ----------------------------------------------------------------------------------------------------------------------
 prepare_config_deployments:
-  stage: prepare_configs
+  stage: prepare_config_deployment
   image:
     name: alpine/git
     entrypoint: ["/bin/sh", "-c"]