diff --git a/docker/docker-compose.full.yml b/docker/docker-compose.full.yml
index 6f34448c4..748b9ac2c 100644
--- a/docker/docker-compose.full.yml
+++ b/docker/docker-compose.full.yml
@@ -38,6 +38,12 @@ services:
       # NPM cache for faster MCP server installs
       - picoclaw-npm-cache:/root/.npm
     command: ["gateway"]
+    healthcheck:
+      test: ["CMD", "wget", "-q", "--spider", "http://localhost:18790/health"]
+      interval: 30s
+      timeout: 3s
+      start_period: 5s
+      retries: 3
 
 volumes:
   picoclaw-workspace: