diff --git a/agents/gerhard-hermes/.clean_shutdown b/agents/gerhard-hermes/.clean_shutdown
new file mode 100644
index 0000000..e69de29
diff --git a/agents/gerhard-hermes/channel_directory.json b/agents/gerhard-hermes/channel_directory.json
index 5e7545c..8870243 100644
--- a/agents/gerhard-hermes/channel_directory.json
+++ b/agents/gerhard-hermes/channel_directory.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
   "updated_at": "2026-05-09T17:16:32.631120",
+=======
+  "updated_at": "2026-05-09T15:50:02.252303",
+>>>>>>> 4179f93276e789a4ddacdd3480d14b69c5944497
   "platforms": {
     "telegram": [],
     "discord": [],
diff --git a/agents/gerhard-hermes/gateway.lock b/agents/gerhard-hermes/gateway.lock
deleted file mode 100644
index 6fb6f4b..0000000
--- a/agents/gerhard-hermes/gateway.lock
+++ /dev/null
@@ -1 +0,0 @@
-{"pid": 7, "kind": "hermes-gateway", "argv": ["/opt/hermes/.venv/bin/hermes", "gateway", "run"], "start_time": 97270363}
\ No newline at end of file
diff --git a/agents/gerhard-hermes/gateway.pid b/agents/gerhard-hermes/gateway.pid
deleted file mode 100755
index 6fb6f4b..0000000
--- a/agents/gerhard-hermes/gateway.pid
+++ /dev/null
@@ -1 +0,0 @@
-{"pid": 7, "kind": "hermes-gateway", "argv": ["/opt/hermes/.venv/bin/hermes", "gateway", "run"], "start_time": 97270363}
\ No newline at end of file
diff --git a/agents/gerhard-hermes/gateway_state.json b/agents/gerhard-hermes/gateway_state.json
index 622fbb3..ee62716 100644
--- a/agents/gerhard-hermes/gateway_state.json
+++ b/agents/gerhard-hermes/gateway_state.json
@@ -1 +1 @@
-{"pid": 7, "kind": "hermes-gateway", "argv": ["/opt/hermes/.venv/bin/hermes", "gateway", "run"], "start_time": 97270363, "gateway_state": "running", "exit_reason": null, "restart_requested": false, "active_agents": 0, "platforms": {}, "updated_at": "2026-05-09T17:16:32.582158+00:00"}
\ No newline at end of file
+{"pid": 7, "kind": "hermes-gateway", "argv": ["/opt/hermes/.venv/bin/hermes", "gateway", "run"], "start_time": 97270363, "gateway_state": "running", "exit_reason": null, "restart_requested": false, "active_agents": 0, "platforms": {}, "updated_at": "2026-05-09T17:16:32.582158+00:00"}
diff --git a/agents/hermes/skills/.gitkeep b/agents/hermes/skills/.gitkeep
index e69de29..8b13789 100644
--- a/agents/hermes/skills/.gitkeep
+++ b/agents/hermes/skills/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/tunnel-entrypoint.sh b/tunnel-entrypoint.sh
index e9aed88..d59d340 100755
--- a/tunnel-entrypoint.sh
+++ b/tunnel-entrypoint.sh
@@ -18,4 +18,5 @@ exec autossh -M 0 -N \
   -R 0.0.0.0:50006:abyssinthia:80 \
   -R 0.0.0.0:50007:gerhard-dashboard:9119 \
   -R 0.0.0.0:11435:festinger:11434 \
+  -R 0.0.0.0:50008:hermes:80 \
   tunnel@glitch.university