diff --git a/docker-compose-integrationtest.yml b/docker-compose-integrationtest.yml
index f06b1d8bb0fbf8a33de28ddc7b6f9293c64dfae7..e21f7443153813d381f05683c22d25b6e753d463 100644
--- a/docker-compose-integrationtest.yml
+++ b/docker-compose-integrationtest.yml
@@ -6,6 +6,8 @@ version: '3.7'
 services:
   naming:
     build: ./
+    networks:
+      - naming-net
     ports:
       - "8080:8083"
     depends_on:
@@ -15,6 +17,8 @@ services:
   
   postgres:
     image: "postgres:9.6.7"
+    networks:
+      - naming-net
     ports:
       - "5432:5432"
     environment:
@@ -35,3 +39,13 @@ services:
 
 volumes:
   naming-data:
+
+networks:
+  naming-net:
+    driver: bridge
+
+
+# ------------------------------------------------------------------------------
+# Note
+# ------------------------------------------------------------------------------
+# container_name property is not supported by Testcontainers
diff --git a/docker-compose.yml b/docker-compose.yml
index d58354920394cdf7d43f8ed277a7f03df1ba7231..fdced5796e854db3f3e0a9464118bea682d18523 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,10 @@
 version: '3.7'
 services:
   naming:
+    container_name: "naming"
     build: ./
+    networks:
+      - naming-net
     ports:
       - "8080:8083"
     depends_on:
@@ -15,6 +18,8 @@ services:
   postgres:
     container_name: "postgres"
     image: "postgres:9.6.7"
+    networks:
+      - naming-net
     ports:
       - "5432:5432"
     environment:
@@ -27,3 +32,7 @@ services:
 
 volumes:
   naming-data:
+
+networks:
+  naming-net:
+    driver: bridge