diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 2100d32bed559d65904d01774e563000119fd3df..d17c7e30102a0722bba38cc68e28c2a562ba1837 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -1,6 +1,7 @@
 services:
     netbox:
         image: "code.europa.eu:4567/digit-c4/netbox-plugins:${TAG}"
+        container_name: netbox_${TAG}
         ports:
             - 8080
         environment:
diff --git a/docker-compose.yml b/docker-compose.yml
index 376afe22db783f30b7661342d3ec5c9be5b7c95a..6d99eea4c1201e4bf1bb37621184cf779dd759a1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,6 @@
 services:
-    netbox:
-        image: code.europa.eu:4567/digit-c4/netbox-plugins:${TAG}
-        container_name: netbox
-        ports:
-            - 8000:8080
+    netbox: &netbox
+        image: code.europa.eu:4567/digit-c4/netbox-plugins:latest
         depends_on:
             postgres:
                 condition: service_healthy