diff --git a/compose.yaml b/compose.yaml
index ce47bf7..6ea132f 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -67,7 +67,13 @@ services:
       SERVER_CROND_ENABLED:         ${SV_CROND_ENABLED}
       GUACAMOLE_UID:                ${SV_USER_ID}
       GUACAMOLE_GID:                ${SV_GROUP_ID}
-      
+
+    healthcheck:
+        test:                       ["CMD-SHELL", "echo > /dev/tcp/localhost/4822 || exit 1"]
+        interval:                   10s
+        timeout:                    3s
+        retries:                    3
+        
     volumes:
       - ./${SV_LOG_INIT_EXT}:${SV_LOG_INIT_INT}
       - ./${SV_LOG_SV_EXT}:${SV_LOG_SV_INT}
@@ -106,6 +112,8 @@ services:
     depends_on:
       database:
         condition:                  service_healthy
+      server:
+        condition:                  service_healthy
         
     environment:
       SERVER_CROND_ENABLED:         ${WA_CROND_ENABLED}
@@ -124,7 +132,7 @@ services:
       GUACAMOLE_CONTEXT:            ${WA_WEBAPP_CONTEXT}
 
     healthcheck:
-        test:                       ["CMD", "curl", "-f", "http://localhost:${WA_PORT_MAIN_INT}/guacamole/"]
+        test:                       ["CMD", "curl", "-f", "http://localhost:${WA_PORT_MAIN_INT}/${WA_WEBAPP_CONTEXT}/"]
         interval:                   10s
         timeout:                    3s
         retries:                    3
diff --git a/env.dist b/env.dist
index c459499..baa5cd0 100644
--- a/env.dist
+++ b/env.dist
@@ -113,4 +113,4 @@ WA_CROND_ENABLED="FALSE"
 WA_LOG_TOMCAT_EXT=./var/log/tomcat
 WA_LOG_TOMCAT_INT=/var/log/tomcat
 
-#WA_WEBAPP_CONTEXT="guacamole"
+WA_WEBAPP_CONTEXT="guacamole"