diff --git a/docker-compose.yml b/docker-compose.yml
index 1c3d95cf790ff14f829748f3033db38122f2a6eb..5431cf700699d430db14391165a754d5ccd15107 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,6 +4,10 @@ services:
       context: ./docker/front
     volumes:
       - homedir:/kasm
+    depends_on:
+      kasm:
+        condition: service_healthy
+        restart: true
   kasm:
     build:
       context: ./docker/kasm
@@ -21,6 +25,12 @@ services:
       - ANACONDA=${ANACONDA}
       - KASM_USER=${VNC_USER}
       - VNCOPTIONS=-PreferBandwidth -DynamicQualityMin=4 -DynamicQualityMax=7 -DLP_ClipDelay=0 -select-de manual -UnixRelay printer:/tmp/printer -allowoverride AcceptPointerEvents  -disableBasicAuth
+    healthcheck:
+      test: ["CMD-SHELL", "test $(kasmvncserver -list | grep '^:' |wc -l) -eq 1"]
+      interval: 10s
+      retries: 5
+      start_period: 30s
+      timeout: 10s
 
 
 volumes: