diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8fd189c..8625de5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -177,7 +177,7 @@ test-auth-api:
     - export API_IMAGE=${USER_MANAGER_TEST_IMAGE_NAME}
     - export CLIENT_IMAGE=dummy-image
     - export FOLDER=auth-domain
-    - export DOCKER_CONTAINER=fids_usermanager_api_dev
+    - export DOCKER_CONTAINER=fids-auth-dev_auth-api
     - *test-api-script
   needs:
     - job: build-auth-api
@@ -196,7 +196,7 @@ test-subscription-api:
     - export API_IMAGE=${SUBSCRIPTION_TEST_IMAGE_NAME}
     - export CLIENT_IMAGE=dummy-image
     - export FOLDER=subscription-domain
-    - export DOCKER_CONTAINER=fids_subscriptions_api_dev
+    - export DOCKER_CONTAINER=fids-subs-dev_subscriptions-api
     - *test-api-script
   needs:
     - job: build-subscription-api
@@ -215,7 +215,7 @@ test-flights-api:
     - export API_IMAGE=${FLIGHTS_INFO_TEST_IMAGE_NAME}
     - export CLIENT_IMAGE=dummy-image
     - export FOLDER=flights-domain
-    - export DOCKER_CONTAINER=fids_flights_api_dev
+    - export DOCKER_CONTAINER=fids-flights-dev_flights-api
     - *test-api-script
   needs:
     - job: build-flights-api
@@ -234,7 +234,7 @@ test-gateway:
     - export API_IMAGE=${GATEWAY_TEST_IMAGE_NAME}
     - export CLIENT_IMAGE=dummy-image
     - export FOLDER=gateway
-    - export DOCKER_CONTAINER=fids_api_gateway_dev
+    - export DOCKER_CONTAINER=fids-gateway-dev_api-gw
     - *test-api-script
   needs:
     - job: build-gateway
@@ -271,7 +271,7 @@ test-browser-client:
   script:
     - export CLIENT_IMAGE=${BROWSER_CLIENT_TEST_IMAGE_NAME}
     - export FOLDER=browser-domain
-    - export DOCKER_CONTAINER=fids_browser_client_dev
+    - export DOCKER_CONTAINER=fids-browser-dev_browser-client
     - *test-client-script
   needs:
     - job: build-browser-client
@@ -289,7 +289,7 @@ test-screen-client:
   script:
     - export CLIENT_IMAGE=${SCREEN_CLIENT_TEST_IMAGE_NAME}
     - export FOLDER=screen-domain
-    - export DOCKER_CONTAINER=fids_screens_client_dev
+    - export DOCKER_CONTAINER=fids-screen_screen-client
     - *test-client-script
   needs:
     - job: build-screen-client
diff --git a/flights-domain/docker-compose.yml b/flights-domain/docker-compose.yml
index 83851d6..ac1af08 100644
--- a/flights-domain/docker-compose.yml
+++ b/flights-domain/docker-compose.yml
@@ -7,16 +7,16 @@ services:
       file: docker-template.yml
       service: flights-api
     depends_on:
-      flights-api-db:
+      flights-db:
         condition: service_healthy
     networks:
       - flights
       - subscriptions
 
-  flights-api-db:
+  flights-db:
     extends:
       file: docker-template.yml
-      service: flights-api-db
+      service: flights-db
     volumes:
       - flights_db:/var/lib/postgresql/data
     networks: