diff --git a/docker-compose-unified.yml b/docker-compose-unified.yml
index 9f57388..bc429d9 100644
--- a/docker-compose-unified.yml
+++ b/docker-compose-unified.yml
@@ -19,9 +19,9 @@ services:
     - type: bind
       source: /opt/trains/data/fileserver
       target: /mnt/fileserver
-    links:
-      - mongo:mongo
-      - elasticsearch:elasticsearch
+    depends_on:
+      - mongo
+      - elasticsearch
     environment:
       ELASTIC_SERVICE_SERVICE_HOST: elasticsearch
       MONGODB_SERVICE_SERVICE_HOST: mongo
diff --git a/docker-compose.yml b/docker-compose.yml
index 89c48e1..31aa0dc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,10 +13,10 @@ services:
     - type: bind
       source: /opt/trains/config
       target: /opt/trains/config
-    links:
-      - mongo:mongo
-      - elasticsearch:elasticsearch
-      - fileserver:fileserver
+    depends_on:
+      - mongo
+      - elasticsearch
+      - fileserver
     environment:
       ELASTIC_SERVICE_SERVICE_HOST: elasticsearch
       MONGODB_SERVICE_SERVICE_HOST: mongo
@@ -102,7 +102,7 @@ services:
     - type: bind
       source: /opt/trains/logs
       target: /var/log/trains
-    links:
+    depends_on:
       - apiserver
     ports:
     - "8080:80"