diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dbc43f2786147417894e8a2b4e5b6fce8e4dc606..242f0b60d656b5466a8b77bf0c412cdca4354057 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,10 +18,7 @@ stages:
   - build
   - build
   - test
-  - unit_test_stage1
-  - unit_test_stage2
-  - unit_test_stage3
-  - unit_test_stage4
+  - unit_test
   #- deploy
   #- end2end_test
 
diff --git a/src/automation/.gitlab-ci.yml b/src/automation/.gitlab-ci.yml
index 610cf8eec5aeb080fe45ab7988c3cd2bb4393c91..9c66a17983d5f547d2ffb9b32f4270c0201cad69 100644
--- a/src/automation/.gitlab-ci.yml
+++ b/src/automation/.gitlab-ci.yml
@@ -42,7 +42,7 @@ build automation:
 unit_test automation:
   variables:
     REPORTS_CONTAINER: "${IMAGE_NAME}-reports"
-  stage: unit_test_stage1
+  stage: unit_test
   needs:
     - build automation
   before_script:
diff --git a/src/compute/.gitlab-ci.yml b/src/compute/.gitlab-ci.yml
index fdf8af236a21e68e1a94828eb22cceae65c0a4cd..d8614cd1c3841f96a3da18d033d0bf1891d83c86 100644
--- a/src/compute/.gitlab-ci.yml
+++ b/src/compute/.gitlab-ci.yml
@@ -43,7 +43,7 @@ unit_test compute:
   variables:
     IMAGE_NAME: 'compute' # name of the microservice
     IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
-  stage: unit_test_stage1
+  stage: unit_test
   needs:
     - build compute
   before_script:
diff --git a/src/context/.gitlab-ci.yml b/src/context/.gitlab-ci.yml
index 7d2a95e7c999423db9576fd6129160f035834a74..044600bc5b4d3d55d66c85fc2e5bed150630a094 100644
--- a/src/context/.gitlab-ci.yml
+++ b/src/context/.gitlab-ci.yml
@@ -43,7 +43,7 @@ unit_test context:
   variables:
     IMAGE_NAME: 'context' # name of the microservice
     IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
-  stage: unit_test_stage1
+  stage: unit_test
   needs:
     - build context
   before_script:
diff --git a/src/device/.gitlab-ci.yml b/src/device/.gitlab-ci.yml
index cb447e2e5ac04c8b86992ac1fa8dc44359b194c0..b0b32ab1558be4df7c4b4edbee55d733b6784c48 100644
--- a/src/device/.gitlab-ci.yml
+++ b/src/device/.gitlab-ci.yml
@@ -43,7 +43,7 @@ unit_test device:
   variables:
     IMAGE_NAME: 'device' # name of the microservice
     IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
-  stage: unit_test_stage1
+  stage: unit_test
   needs:
     - build device
   before_script:
diff --git a/src/monitoring/.gitlab-ci.yml b/src/monitoring/.gitlab-ci.yml
index 1dfefa1eefb473913e7e74810ebce5967e738886..4a981cba23f5197c08e673afe292505d38577982 100644
--- a/src/monitoring/.gitlab-ci.yml
+++ b/src/monitoring/.gitlab-ci.yml
@@ -43,7 +43,7 @@ unit_test monitoring:
   variables:
     IMAGE_NAME: 'monitoring' # name of the microservice
     IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
-  stage: unit_test_stage1
+  stage: unit_test
   needs:
     - build monitoring
   before_script:
diff --git a/src/pathcomp/.gitlab-ci.yml b/src/pathcomp/.gitlab-ci.yml
index 5749a94fe5324acb190accda4f50a88abd03d6bf..7658fcae9d237855293c7f63b5d709a6f9c0cd48 100644
--- a/src/pathcomp/.gitlab-ci.yml
+++ b/src/pathcomp/.gitlab-ci.yml
@@ -52,7 +52,7 @@ unit_test pathcomp-backend:
   variables:
     IMAGE_NAME: 'pathcomp' # name of the microservice
     IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
-  stage: unit_test_stage1
+  stage: unit_test
   needs:
     - build pathcomp
   before_script:
@@ -97,10 +97,9 @@ unit_test pathcomp-frontend:
   variables:
     IMAGE_NAME: 'pathcomp' # name of the microservice
     IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
-  stage: unit_test_stage2
+  stage: unit_test
   needs:
     - build pathcomp
-    - unit_test pathcomp-backend
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
     - if docker network list | grep teraflowbridge; then echo "teraflowbridge is already created"; else docker network create --driver=bridge --subnet=172.28.0.0/24 --gateway=172.28.0.254 teraflowbridge; fi
diff --git a/src/policy/.gitlab-ci.yml b/src/policy/.gitlab-ci.yml
index d19da81d6be630de6ad5af8c498ddf021110307c..f257c554c95dee8230c0fc756842d0e71570cad0 100644
--- a/src/policy/.gitlab-ci.yml
+++ b/src/policy/.gitlab-ci.yml
@@ -42,7 +42,7 @@ build policy:
 unit_test policy:
   variables:
     REPORTS_CONTAINER: "${IMAGE_NAME_POLICY}-reports"
-  stage: unit_test_stage1
+  stage: unit_test
   needs:
     - build policy
   before_script:
diff --git a/src/service/.gitlab-ci.yml b/src/service/.gitlab-ci.yml
index cda0110623df93fd9dc504c5e2a067ada3265585..ae4b2c3af2047488d4d0888c461af10cbbcfcbac 100644
--- a/src/service/.gitlab-ci.yml
+++ b/src/service/.gitlab-ci.yml
@@ -43,7 +43,7 @@ unit_test service:
   variables:
     IMAGE_NAME: 'service' # name of the microservice
     IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
-  stage: unit_test_stage3
+  stage: unit_test
   needs:
     - build service
   before_script:
diff --git a/src/slice/.gitlab-ci.yml b/src/slice/.gitlab-ci.yml
index 5fbff7029ca53db6fee658d16491bc9c34477359..c1b2eb4874d1606a2dfec8b7618e7da66e619567 100644
--- a/src/slice/.gitlab-ci.yml
+++ b/src/slice/.gitlab-ci.yml
@@ -43,7 +43,7 @@ unit_test slice:
   variables:
     IMAGE_NAME: 'slice' # name of the microservice
     IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
-  stage: unit_test_stage4
+  stage: unit_test
   needs:
     - build slice
     - unit_test service