diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 5880d67d03d9638b60a14b32240b827b87a113a9..c258aabfe58fd6cfdaa619d914298f1d5df1ca8a 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -3,15 +3,19 @@ services:
     netbox:
         image: "code.europa.eu:4567/digit-c4/netbox-plugins:${TAG}"
         ports:
-            - 8080
+          - 8080
         healthcheck:
             start_period: 2s
             retries: 30
         env_file: env/netbox.env
+        environment:
+          - DB_HOST=postgres_${TAG}
+          - REDIS_CACHE_HOST=redis_cache_${TAG}
+          - REDIS_HOST=redis_${TAG}
         labels:
-            - "traefik.http.routers.netbox.rule=Host(`${TAG}.${HOSTNAME}`)"
+          - "traefik.http.routers.netbox-${TAG}.rule=Host(`${TAG}.netbox.ntx.lu`)"
         networks:
-            - traefik
+          - traefik
         logging:
             driver: "syslog"
             options:
@@ -22,7 +26,7 @@ services:
         image: "code.europa.eu:4567/digit-c4/netbox-plugins:${TAG}"
         env_file: env/netbox.env
         networks:
-            - traefik
+          - traefik
         logging:
             driver: "syslog"
             options:
@@ -33,7 +37,7 @@ services:
         image: "code.europa.eu:4567/digit-c4/netbox-plugins:${TAG}"
         env_file: env/netbox.env
         networks:
-            - traefik
+          - traefik
         logging:
             driver: "syslog"
             options:
@@ -41,9 +45,10 @@ services:
                 syslog-format: "rfc5424"
                 tag: "netbox-housekeeping"
     postgres:
+        container_name: postgres_${TAG}
         env_file: env/postgres.env
         networks:
-            - traefik
+          - traefik
         logging:
             driver: "syslog"
             options:
@@ -51,9 +56,10 @@ services:
                 syslog-format: "rfc5424"
                 tag: "netbox-postgres"
     redis:
+        container_name: redis_${TAG}
         env_file: env/redis.env
         networks:
-            - traefik
+          - traefik
         logging:
             driver: "syslog"
             options:
@@ -61,9 +67,10 @@ services:
                 syslog-format: "rfc5424"
                 tag: "netbox-redis"
     redis-cache:
+        container_name: redis_cache_${TAG}
         env_file: env/redis-cache.env
         networks:
-            - traefik
+          - traefik
         logging:
             driver: "syslog"
             options:
diff --git a/env/netbox.env b/env/netbox.env
index 7ef60b578c7eb65ece8bff1a389abe129c6b45b1..44660756dd2b32440032f82ed875d03a254ac2e4 100644
--- a/env/netbox.env
+++ b/env/netbox.env
@@ -1,5 +1,4 @@
 CORS_ORIGIN_ALLOW_ALL=True
-DB_HOST=postgres
 DB_NAME=netbox
 DB_PASSWORD=J5brHrAXFLQSif0K
 DB_USER=netbox
@@ -20,12 +19,10 @@ HOUSEKEEPING_INTERVAL=86400
 MEDIA_ROOT=/opt/netbox/netbox/media
 METRICS_ENABLED=true
 REDIS_CACHE_DATABASE=1
-REDIS_CACHE_HOST=redis-cache
 REDIS_CACHE_INSECURE_SKIP_TLS_VERIFY=false
 REDIS_CACHE_PASSWORD=t4Ph722qJ5QHeQ1qfu36
 REDIS_CACHE_SSL=false
 REDIS_DATABASE=0
-REDIS_HOST=redis
 REDIS_INSECURE_SKIP_TLS_VERIFY=false
 REDIS_PASSWORD=H733Kdjndks81
 REDIS_SSL=false