diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18548cffb..f09df0e25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@ Write the date in place of the "Unreleased" in the case a new version is release
 
 # Changelog
 
+## Unreleased
+
+### Added
+
+- `docker-compose.yml` now uses the healthcheck endpoint `/healthz`
+
 ## 2024-12-09
 
 ### Added
diff --git a/docker-compose.yml b/docker-compose.yml
index c2dda2ec2..d5d5e41f0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,12 @@ services:
     ports:
       - 8000:8000
     restart: unless-stopped
+    healthcheck:
+      test: curl --fail http://localhost:8000/healthz || exit 1
+      interval: 60s
+      timeout: 10s
+      retries: 3
+      start_period: 30s
 
   # Below we additionally configure monitoring with Prometheus and Grafana.
   # This is optional; it is not required for Tiled to function.