diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7c7d69cd..3fe87fd07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ Docs: https://docs.clawd.bot
 - Tlon: add Urbit channel plugin (DMs, group mentions, thread replies). (#1544) Thanks @wca4a.
 
 ### Fixes
-- Logging: guard console settings resolution to avoid recursion on config warnings. (#1555) Thanks @travisp.
+- Docker: update gateway command in docker-compose and Hetzner guide. (#1514)
 - Voice wake: auto-save wake words on blur/submit across iOS/Android and align limits with macOS.
 - UI: keep the Control UI sidebar visible while scrolling long pages. (#1515) Thanks @pookNast.
 - Tailscale: retry serve/funnel with sudo only for permission errors and keep original failure details. (#1551) Thanks @sweepies.
diff --git a/docker-compose.yml b/docker-compose.yml
index 7970084fc..8b9859f05 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       [
         "node",
         "dist/index.js",
-        "gateway-daemon",
+        "gateway",
         "--bind",
         "${CLAWDBOT_GATEWAY_BIND:-lan}",
         "--port",
diff --git a/docs/platforms/hetzner.md b/docs/platforms/hetzner.md
index 1a3c2f836..4516040cc 100644
--- a/docs/platforms/hetzner.md
+++ b/docs/platforms/hetzner.md
@@ -184,7 +184,7 @@ services:
       [
         "node",
         "dist/index.js",
-        "gateway-daemon",
+        "gateway",
         "--bind",
         "${CLAWDBOT_GATEWAY_BIND}",
         "--port",
diff --git a/src/docker-setup.test.ts b/src/docker-setup.test.ts
index 95e307821..30824804d 100644
--- a/src/docker-setup.test.ts
+++ b/src/docker-setup.test.ts
@@ -132,4 +132,10 @@ describe("docker-setup.sh", () => {
     const log = await readFile(logPath, "utf8");
     expect(log).toContain("--build-arg CLAWDBOT_DOCKER_APT_PACKAGES=ffmpeg build-essential");
   });
+
+  it("keeps docker-compose gateway command in sync", async () => {
+    const compose = await readFile(join(repoRoot, "docker-compose.yml"), "utf8");
+    expect(compose).not.toContain("gateway-daemon");
+    expect(compose).toContain('"gateway"');
+  });
 });