diff --git a/airdcpp/docker-compose.yml b/airdcpp/docker-compose.yml
index 638cee8..c11e830 100644
--- a/airdcpp/docker-compose.yml
+++ b/airdcpp/docker-compose.yml
@@ -34,7 +34,8 @@ services:
     - no-new-privileges:true
 
     depends_on:
-    - openvpn
+      openvpn:
+        condition: service_healthy
 
     network_mode: service:openvpn
     volumes:
diff --git a/indexarr/docker-compose.yml b/indexarr/docker-compose.yml
index 779e989..4aeaca7 100644
--- a/indexarr/docker-compose.yml
+++ b/indexarr/docker-compose.yml
@@ -34,7 +34,8 @@ services:
     - no-new-privileges:true
 
     depends_on:
-    - openvpn
+      openvpn:
+        condition: service_healthy
 
     network_mode: service:openvpn
     volumes:
@@ -59,8 +60,10 @@ services:
     - no-new-privileges:true
 
     depends_on:
-    - openvpn
-    - solvarr
+      openvpn:
+        condition: service_healthy
+      solvarr:
+        condition: service_healthy
 
     network_mode: service:openvpn
     volumes:
diff --git a/netbox/docker-compose.yml b/netbox/docker-compose.yml
index fa31082..415281c 100644
--- a/netbox/docker-compose.yml
+++ b/netbox/docker-compose.yml
@@ -65,8 +65,10 @@ services:
     - no-new-privileges:true
 
     depends_on:
-    - postgres
-    - redis
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
 
     networks:
     - default
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index b209053..6a01644 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -106,8 +106,10 @@ services:
     user: ${USER_ID:?}
 
     depends_on:
-    - mariadb
-    - redis
+      mariadb:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
 
     networks:
     - default
@@ -150,7 +152,8 @@ services:
     # user: ${USER_ID:?}
 
     depends_on:
-    - nextcloud
+      nextcloud:
+        condition: service_healthy
 
     networks:
     - default
diff --git a/pihole/docker-compose.yml b/pihole/docker-compose.yml
index fcb1b0f..2e91da6 100644
--- a/pihole/docker-compose.yml
+++ b/pihole/docker-compose.yml
@@ -40,7 +40,8 @@ services:
     # NOTE: no `user:` needed; runs as non-root user since 2022.01
 
     depends_on:
-    - dnscrypt-proxy
+      dnscrypt-proxy:
+        condition: service_healthy
 
     networks:
       default:
diff --git a/qbittorrent/docker-compose.yml b/qbittorrent/docker-compose.yml
index a29408c..bb4a627 100644
--- a/qbittorrent/docker-compose.yml
+++ b/qbittorrent/docker-compose.yml
@@ -34,7 +34,8 @@ services:
     tty: true
 
     depends_on:
-    - openvpn
+      openvpn:
+        condition: service_healthy
 
     network_mode: service:openvpn
     volumes:
diff --git a/teslamate/docker-compose.yml b/teslamate/docker-compose.yml
index 4a6e8bc..5449c84 100644
--- a/teslamate/docker-compose.yml
+++ b/teslamate/docker-compose.yml
@@ -65,8 +65,10 @@ services:
     user: ${USER_ID:?}
 
     depends_on:
-    - db
-    - mqtt
+      db:
+        condition: service_healthy
+      mqtt:
+        condition: service_healthy
 
     networks:
     - default
diff --git a/unifi/docker-compose.yml b/unifi/docker-compose.yml
index bc8b18c..d6813f1 100644
--- a/unifi/docker-compose.yml
+++ b/unifi/docker-compose.yml
@@ -33,7 +33,8 @@ services:
     - no-new-privileges:true
 
     depends_on:
-    - mongo
+      mongo:
+        condition: service_healthy
 
     volumes:
     - ./data/unifi/usr/lib/unifi/cert:/usr/lib/unifi/cert:rw