diff --git a/build/docker-compose.yaml b/build/docker-compose.yaml
index 78d1f39..50f10bc 100644
--- a/build/docker-compose.yaml
+++ b/build/docker-compose.yaml
@@ -63,7 +63,8 @@ services:
     environment:
       - KAFKA_URL=kafka:29092
     depends_on:
-      - kafka-init
+      kafka-init:
+        condition: service_completed_successfully
     restart: always
   
   presense-server:
@@ -78,8 +79,10 @@ services:
     ports:
       - "127.0.0.1:1902:1902"
     depends_on:
-      - kafka-init
-      - valkey
+      valkey:
+        condition: service_started
+      kafka-init:
+        condition: service_completed_successfully
     restart: always
 
   presense-bridge:
@@ -94,7 +97,8 @@ services:
       - MQTT_USERNAME=user
       - MQTT_PASSWORD=pass
     depends_on:
-      - kafka-init
+      kafka-init:
+        condition: service_completed_successfully
     restart: always
 
   presense-location:
@@ -106,7 +110,8 @@ services:
     environment:
       - KAFKA_URL=kafka:29092
     depends_on:
-      - kafka-init
+      kafka-init:
+        condition: service_completed_successfully
     restart: always