diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59e0f0043bd713f75b5871784f18727101341569..0c5ff9325944d1a5a54d941d32d6a45782257970 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,6 +46,8 @@ include:
   - local: '/src/load_generator/.gitlab-ci.yml'
   - local: '/src/bgpls_speaker/.gitlab-ci.yml'
   - local: '/src/kpi_manager/.gitlab-ci.yml'
+  - local: '/src/kpi_value_api/.gitlab-ci.yml'
+  - local: '/src/kpi_value_writer/.gitlab-ci.yml'
 
   # This should be last one: end-to-end integration tests
   - local: '/src/tests/.gitlab-ci.yml'
diff --git a/src/kpi_manager/.gitlab-ci.yml b/src/kpi_manager/.gitlab-ci.yml
index 7d38700367d3a3b8a26c211d274de8d75a2c8c89..498cfd89fb3da85fec1b2ad0c930408eab215dc5 100644
--- a/src/kpi_manager/.gitlab-ci.yml
+++ b/src/kpi_manager/.gitlab-ci.yml
@@ -15,7 +15,7 @@
 # Build, tag, and push the Docker image to the GitLab Docker registry
 build kpi-manager:
   variables:
-    IMAGE_NAME: 'kpi-manager' # name of the microservice
+    IMAGE_NAME: 'kpi_manager' # name of the microservice
     IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
   stage: build
   before_script:
@@ -41,7 +41,7 @@ build kpi-manager:
 # Apply unit test to the component
 unit_test kpi-manager:
   variables:
-    IMAGE_NAME: 'kpi-manager' # name of the microservice
+    IMAGE_NAME: 'kpi_manager' # name of the microservice
     IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
   stage: unit_test
   needs:
diff --git a/src/kpi_value_api/.gitlab-ci.yml b/src/kpi_value_api/.gitlab-ci.yml
index c9107abaac83199cc18ea720e4e3e5e14e353189..166e9d3cbcf3eb09c914384a9906853dddd7bfb5 100644
--- a/src/kpi_value_api/.gitlab-ci.yml
+++ b/src/kpi_value_api/.gitlab-ci.yml
@@ -15,7 +15,7 @@
 # Build, tag, and push the Docker image to the GitLab Docker registry
 build kpi-value-api:
   variables:
-    IMAGE_NAME: 'kpi-value-api' # name of the microservice
+    IMAGE_NAME: 'kpi_value_api' # name of the microservice
     IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
   stage: build
   before_script:
@@ -41,7 +41,7 @@ build kpi-value-api:
 # Apply unit test to the component
 unit_test kpi-value-api:
   variables:
-    IMAGE_NAME: 'kpi-value-api' # name of the microservice
+    IMAGE_NAME: 'kpi_value_api' # name of the microservice
     IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
   stage: unit_test
   needs:
diff --git a/src/kpi_value_writer/.gitlab-ci.yml b/src/kpi_value_writer/.gitlab-ci.yml
index 52b1b8fe6fd41c5fd8b43adf4ca8da464c8c08ba..25619ce7f8b4346172587dbf2e804896aff20e4d 100644
--- a/src/kpi_value_writer/.gitlab-ci.yml
+++ b/src/kpi_value_writer/.gitlab-ci.yml
@@ -15,7 +15,7 @@
 # Build, tag, and push the Docker image to the GitLab Docker registry
 build kpi-value-writer:
   variables:
-    IMAGE_NAME: 'kpi-value-writer' # name of the microservice
+    IMAGE_NAME: 'kpi_value_writer' # name of the microservice
     IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
   stage: build
   before_script:
@@ -41,7 +41,7 @@ build kpi-value-writer:
 # Apply unit test to the component
 unit_test kpi-value-writer:
   variables:
-    IMAGE_NAME: 'kpi-value-writer' # name of the microservice
+    IMAGE_NAME: 'kpi_value_writer' # name of the microservice
     IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
   stage: unit_test
   needs: