diff --git a/supplemental/docker/hub/docker-compose.yml b/supplemental/docker/hub/docker-compose.yml
index a5bf3ec7..d14fd114 100644
--- a/supplemental/docker/hub/docker-compose.yml
+++ b/supplemental/docker/hub/docker-compose.yml
@@ -7,3 +7,9 @@ services:
       - '8090:8090'
     volumes:
       - ./beszel_data:/beszel_data
+    healthcheck:
+      test: ["CMD", "/beszel", "health", "--url", "http://127.0.0.1:8090"]
+      interval: 30s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
diff --git a/supplemental/docker/same-system/docker-compose.yml b/supplemental/docker/same-system/docker-compose.yml
index ebd9595f..a6f498e1 100644
--- a/supplemental/docker/same-system/docker-compose.yml
+++ b/supplemental/docker/same-system/docker-compose.yml
@@ -9,6 +9,12 @@ services:
       - ./beszel_data:/beszel_data
     extra_hosts:
       - 'host.docker.internal:host-gateway'
+    healthcheck:
+      test: ["CMD", "/beszel", "health", "--url", "http://127.0.0.1:8090"]
+      interval: 30s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
 
   beszel-agent:
     image: 'henrygd/beszel-agent' #Add -nvidia for nvidia gpus