diff --git a/ai/compose.yml b/ai/compose.yml
index cd78971..1c87fb2 100755
--- a/ai/compose.yml
+++ b/ai/compose.yml
@@ -6,19 +6,19 @@ services:
       ssh:
         - default
     container_name: hermes
-    entrypoint: ["/bin/bash", "-c",
-      "bash /usr/local/bin/run-multi-gateways.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
-      "hermes-entrypoint"]
     restart: always
-    # Gateway run enables the internal API server on port 8642
-    command: gateway run
+    # Use the image default ENTRYPOINT ["/init", "/opt/hermes/docker/main-wrapper.sh"]
+    # for proper s6-overlay supervision. The CMD runs our multi-profile launcher
+    # which spawns per-profile gateways in background, then the default gateway
+    # in foreground (keeps the container alive).
+    command: ["/opt/data/start-hermes.sh"]
     environment:
       - HERMES_UID=10000
       - HERMES_GID=10000
       - OLLAMA_HOST=http://ollama:11434
       - HERMES_DASHBOARD=1
       # Multi-profile: comma-separated list of profiles to run as gateways.
-      # The entrypoint reads this and starts one gateway per profile.
+      # start-hermes.sh reads this and starts one gateway per profile.
       # Add profiles here when they exist on disk (e.g. default,researcher,writer)
       - HERMES_PROFILES=ashley,claire,finn,matt,paul
       - API_SERVER_ENABLED=true