diff --git a/backend/routers/system.py b/backend/routers/system.py
index dc3368a..0380221 100644
--- a/backend/routers/system.py
+++ b/backend/routers/system.py
@@ -59,12 +59,12 @@ def services() -> dict:
     gw_url = f"{GATEWAY_URL}/v1"
     return {
         "services": [
-            {"name": "Engine (llama-swap)", "url": LLAMA_SWAP_URL, "ok": engine_reachable()},
-            {"name": "Gateway (integriert)", "url": gw_url, "ok": gateway_reachable()},
-            {"name": "Hermes-Gateway", "url": HERMES_API_URL, "ok": a["gateway_reachable"]},
-            {"name": "Hermes-Terminal", "url": a["terminal_url"], "ok": a["terminal_reachable"]},
-            {"name": "Mem0 (Gedächtnis)", "url": MEM0_SERVICE_URL, "ok": _mem0_reachable()},
-            {"name": "Voice (STT/TTS)", "url": VOICE_SERVICE_URL, "ok": _voice_reachable()},
+            {"name": "Engine (llama-swap)", "unit": "llama-swap", "url": LLAMA_SWAP_URL, "ok": engine_reachable()},
+            {"name": "Gateway (integriert)", "unit": "mission-control-2", "url": gw_url, "ok": gateway_reachable()},
+            {"name": "Hermes-Gateway", "unit": "hermes-gateway", "url": HERMES_API_URL, "ok": a["gateway_reachable"]},
+            {"name": "Hermes-Terminal", "unit": "hermes-terminal", "url": a["terminal_url"], "ok": a["terminal_reachable"]},
+            {"name": "Mem0 (Gedächtnis)", "unit": "mem0-service", "url": MEM0_SERVICE_URL, "ok": _mem0_reachable()},
+            {"name": "Voice (STT/TTS)", "unit": "voice-service", "url": VOICE_SERVICE_URL, "ok": _voice_reachable()},
         ],
         "links": {
             "engine_ui": f"{LLAMA_SWAP_URL}/ui",
diff --git a/frontend/src/components/dashboard/ServicesCard.tsx b/frontend/src/components/dashboard/ServicesCard.tsx
index ac3b36f..2e0dd1c 100644
--- a/frontend/src/components/dashboard/ServicesCard.tsx
+++ b/frontend/src/components/dashboard/ServicesCard.tsx
@@ -43,7 +43,7 @@ export function ServicesCard() {
         <div className="flex flex-1 flex-col">
           <div className="space-y-1.5">
             {svc.services.map((x) => (
-              <div key={x.name} className="group flex items-center justify-between gap-2 rounded-xl border border-border/30 bg-background/20 p-2.5">
+              <div key={x.unit} className="group flex items-center justify-between gap-2 rounded-xl border border-border/30 bg-background/20 p-2.5">
                 <div className="flex min-w-0 items-center gap-2">
                   <span className={cn("h-2.5 w-2.5 shrink-0 rounded-full ring-2 ring-black/40", x.ok ? "bg-emerald-500" : "bg-amber-500")} />
                   <div className="min-w-0">
@@ -52,11 +52,11 @@ export function ServicesCard() {
                   </div>
                 </div>
                 <button
-                  onClick={() => restart(x.name)} disabled={restarting[x.name]}
+                  onClick={() => restart(x.unit)} disabled={restarting[x.unit]}
                   className="flex h-7 w-7 shrink-0 items-center justify-center rounded-lg border border-border/40 text-muted-foreground opacity-0 transition-all hover:bg-primary/5 hover:text-primary group-hover:opacity-100"
                   title="Dienst neu starten"
                 >
-                  <RefreshCw className={cn("h-3.5 w-3.5", restarting[x.name] && "animate-spin")} />
+                  <RefreshCw className={cn("h-3.5 w-3.5", restarting[x.unit] && "animate-spin")} />
                 </button>
               </div>
             ))}