diff --git a/docker-compose.yml b/docker-compose.yml
index 7784a852..5856d0d1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,33 @@
 services:
+  hermes-agent:
+    image: 'nousresearch/hermes-agent@sha256:2f1f2f1725e5dc9a61cf6a2dea5aca52a776ec4d022cb29679e6aa3ff303e77a'
+    command: 'gateway run'
+    environment:
+      - HERMES_HOME=/home/hermes/.hermes
+      - HERMES_UID=1000
+      - HERMES_GID=1000
+      - 'OPENROUTER_API_KEY=${OPENROUTER_API_KEY}'
+      - 'ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}'
+      - 'OPENAI_API_KEY=${OPENAI_API_KEY}'
+      - 'GOOGLE_API_KEY=${GOOGLE_API_KEY}'
+    volumes:
+      - 'hermes-home:/home/hermes/.hermes'
+      - 'hermes-agent-src:/opt/hermes'
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - 'test -d /home/hermes/.hermes || exit 1'
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
   hermes-webui:
     build:
       context: .
       dockerfile: Dockerfile
     image: hermes-webui:0.51.92-frameable
+    depends_on:
+      - hermes-agent
     environment:
       - SERVICE_URL_HERMESWEBUI_8787
       - HERMES_WEBUI_HOST=0.0.0.0
@@ -12,10 +36,6 @@ services:
       - WANTED_UID=1000
       - WANTED_GID=1000
       - 'HERMES_WEBUI_PASSWORD=${SERVICE_PASSWORD_HERMESWEBUI}'
-      - 'OPENROUTER_API_KEY=${OPENROUTER_API_KEY}'
-      - 'ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}'
-      - 'OPENAI_API_KEY=${OPENAI_API_KEY}'
-      - 'GOOGLE_API_KEY=${GOOGLE_API_KEY}'
     volumes:
       - 'hermes-home:/home/hermeswebui/.hermes'
       - 'hermes-agent-src:/home/hermeswebui/.hermes/hermes-agent:ro'