diff --git a/docker-compose-env.yml b/docker-compose-env.yml
index 0a64f19..e157a34 100644
--- a/docker-compose-env.yml
+++ b/docker-compose-env.yml
@@ -10,6 +10,9 @@ services:
       - NETWORK_SERVER__GATEWAY__BACKEND__MQTT__SERVER=tcp://mosquitto:1883
       - JOIN_SERVER__DEFAULT__SERVER=http://chirpstack-application-server:8003
       - GEOLOCATION_SERVER__SERVER=chirpstack-geolocation-server:8005
+    depends_on:
+      - postgresql
+      - mosquitto
 
   chirpstack-application-server:
     image: chirpstack/chirpstack-application-server:3
@@ -21,6 +24,8 @@ services:
       - APPLICATION_SERVER__INTEGRATION__MQTT__SERVER=tcp://mosquitto:1883
       - APPLICATION_SERVER__API__PUBLIC_HOST=chirpstack-application-server:8001
       - APPLICATION_SERVER__EXTERNAL_API__JWT_SECRET=verysecret
+    depends_on:
+      - chirpstack-network-server
 
   chirpstack-gateway-bridge:
     image: chirpstack/chirpstack-gateway-bridge:3
@@ -28,6 +33,8 @@ services:
       - 1700:1700/udp
     environment:
       - INTEGRATION__MQTT__AUTH__GENERIC__SERVERS=tcp://mosquitto:1883
+    depends_on: 
+      - mosquitto
 
   chirpstack-geolocation-server:
     image: chirpstack/chirpstack-geolocation-server:3
diff --git a/docker-compose.yml b/docker-compose.yml
index 6a9315d..423c3ef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,6 +5,9 @@ services:
     image: chirpstack/chirpstack-network-server:3
     volumes:
       - ./configuration/chirpstack-network-server:/etc/chirpstack-network-server
+    depends_on:
+      - postgresql
+      - mosquitto
 
   chirpstack-application-server:
     image: chirpstack/chirpstack-application-server:3
@@ -12,6 +15,8 @@ services:
       - 8080:8080
     volumes:
       - ./configuration/chirpstack-application-server:/etc/chirpstack-application-server
+    depends_on:
+      - chirpstack-network-server
 
   chirpstack-gateway-bridge:
     image: chirpstack/chirpstack-gateway-bridge:3
@@ -19,6 +24,8 @@ services:
       - 1700:1700/udp
     volumes:
       - ./configuration/chirpstack-gateway-bridge:/etc/chirpstack-gateway-bridge
+    depends_on: 
+      - mosquitto
 
   chirpstack-geolocation-server:
     image: chirpstack/chirpstack-geolocation-server:3