diff --git a/pica-etherpad/docker-compose.yml b/pica-etherpad/docker-compose.yml
index fcee74219328c7e318f90aad2b63b96fc121b3d7..b1573bc66ce90a64d4ce162affe4e2990b4c63d1 100755
--- a/pica-etherpad/docker-compose.yml
+++ b/pica-etherpad/docker-compose.yml
@@ -2,9 +2,13 @@ version : "2.4"
 
 volumes:
   etherpad-db:
-    external: true
+    name: etherpad-db
+  etherpad-week-db:
+    name: etherpad-week-db
 
 networks:
+  standard:
+  week:
   docker_default:
     external: true
     name: "docker_default"
@@ -15,8 +19,6 @@ services:
     container_name: etherpad-app
     depends_on:
       - etherpad-db
-    links:
-      - etherpad-db:etherpad-db
     security_opt:
       - no-new-privileges
     mem_limit: "2048m"
@@ -40,6 +42,7 @@ services:
     restart: unless-stopped
     networks:
       - docker_default
+      - standard
 
   etherpad-db:
     image: registry.picasoft.net/pica-etherpad-db:mysql8.picapatch2
@@ -56,15 +59,13 @@ services:
     # See https://stackoverflow.com/questions/41134785/how-to-solve-mysql-warning-innodb-page-cleaner-1000ms-intended-loop-took-xxx
     command: --innodb_lru_scan_depth=128 --default-authentication-plugin=mysql_native_password
     networks:
-      - docker_default
+      - standard
 
   etherpad-week-app:
     image: registry.picasoft.net/pica-etherpad:1.8.4
     container_name: etherpad-week-app
     depends_on:
       - etherpad-week-db
-    links:
-      - etherpad-week-db:etherpad-week-db
     security_opt:
       - no-new-privileges
     mem_limit: "2048m"
@@ -88,6 +89,7 @@ services:
     restart: unless-stopped
     networks:
       - docker_default
+      - week
 
   etherpad-week-db:
     image: registry.picasoft.net/pica-etherpad-db:mysql8.picapatch2
@@ -104,4 +106,4 @@ services:
     # See https://stackoverflow.com/questions/41134785/how-to-solve-mysql-warning-innodb-page-cleaner-1000ms-intended-loop-took-xxx
     command: --innodb_lru_scan_depth=128 --default-authentication-plugin=mysql_native_password
     networks:
-      - docker_default
+      - week