diff --git a/docker/Dockerfile b/docker/Dockerfile
index adcb557f8c..06a7323008 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -99,7 +99,8 @@ ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 
 # Configure healthcheck
 # todo: make sure only the registry availability is checks since devices are not maintained by this instance.
-HEALTHCHECK --interval=15m --timeout=2m CMD bco-validate --host ${MQTT_BROKER} > /dev/null || exit 1
+HEALTHCHECK --interval=30s --timeout=5s --start-period=60s --retries=3 \
+  CMD curl -f http://localhost:13781/actuator/health || exit 1
 
 # Set command
 ## Need to be in array form to not encapsulate command in another shell session because
diff --git a/module/api/graphql/build.gradle.kts b/module/api/graphql/build.gradle.kts
index c74a1de7bc..5acc36621b 100644
--- a/module/api/graphql/build.gradle.kts
+++ b/module/api/graphql/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
 
     api("org.eclipse.jetty:jetty-server:11.0.14")
     api("jakarta.servlet:jakarta.servlet-api:6.0.0")
+    implementation("org.springframework.boot:spring-boot-starter-actuator:_")
 
 
 
diff --git a/versions.properties b/versions.properties
index 5a79e9c922..3465159491 100644
--- a/versions.properties
+++ b/versions.properties
@@ -94,6 +94,8 @@ plugin.org.springframework.boot=3.1.2
 
 plugin.io.spring.dependency-management=1.1.2
 
+version.org.springframework.boot..spring-boot-starter-actuator=3.1.2
+
 version.kotlin=2.0.0
 
 version.org.openbase..jul.communication.controller=3.7.2