diff --git a/docker-compose.yml b/docker-compose.yml
index 0f668a64548597567acfe0cafcb3212b4b1136fd..7cff1602518030afd78ccbe333e414b682717663 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,17 @@
 version: '2'
 
 services:
-  backend:
-    container_name: backend
+  portal-backend:
+    container_name: portal-backend
     build:
       context: .
       dockerfile: ./src/docker/run/Dockerfile
     depends_on:
-      - "db"
+      - "portal-db"
     ports:
       - "8080:8080"
     links:
-      - "db"
+      - "portal-db"
     volumes:
       - ./config:/config
     environment:
@@ -33,8 +33,8 @@ services:
       EXAREME_URL: http://hbps2.chuv.ch:9090/mining/query
       FRONTEND_REDIRECT_URL: http://frontend/home
 
-  db:
-    container_name: db
+  portal-db:
+    container_name: portal-db
     image: postgres:9.5.3
     ports:
       - "5432:5432"
diff --git a/docker-compose_build.yml b/docker-compose_build.yml
index b29bf59ecd0f6a068269bcc0fed3f0498bb9505d..11fc3383775089d2b5d0c4ca2866931b1783aa28 100644
--- a/docker-compose_build.yml
+++ b/docker-compose_build.yml
@@ -1,8 +1,8 @@
 version: '2'
 
 services:
-  backend_build:
-    container_name: backend_build
+  portal-backend-build:
+    container_name: portal-backend-build
     build: ./src/docker/build/
     volumes:
       - ./:/opt/portal/