diff --git a/docs/chelsty-runtime.md b/docs/chelsty-runtime.md
index f8e4ab3..257868e 100644
--- a/docs/chelsty-runtime.md
+++ b/docs/chelsty-runtime.md
@@ -28,7 +28,7 @@ Zigbee2MQTT is configured to connect to this coordinator over the local network.
 
 - **WAN Resilience**: All core automation (Zigbee, MQTT) runs locally on CHELSTY.
 - **Connectivity**: LTE provides intermittent uplink for remote management and Tailscale access.
-- **Home Assistant**: Runs in a separate VM, connecting to the Mosquitto broker on CHELSTY.
+- **Home Assistant**: Runs on `chelsty-ha` node, connecting to the Mosquitto broker on `chelsty-infra`.
 
 ## Deployment Flow
 
@@ -48,7 +48,8 @@ Zigbee2MQTT is configured to connect to this coordinator over the local network.
 3. **Service Deployment**:
    Use the staged deployment runtime:
    ```bash
-   ./scripts/deploy/deploy-node.sh chelsty
+   ./scripts/deploy/deploy-node.sh chelsty-infra
+   ./scripts/deploy/deploy-node.sh chelsty-ha
    ```
 
 ## Recovery Procedure
diff --git a/docs/chelsty-stability-agent.md b/docs/chelsty-stability-agent.md
index e6f63d3..9ed32ce 100644
--- a/docs/chelsty-stability-agent.md
+++ b/docs/chelsty-stability-agent.md
@@ -19,7 +19,7 @@ It acts as a filesystem-first watchdog that detects anomalies in the local runti
 
 *   **Heartbeat**: Updated every cycle at `/opt/homelab/state/stability-agent.heartbeat`.
 *   **State Summary**: A JSON summary of all latest checks at `/opt/homelab/state/stability-agent.json`.
-*   **Events**: Append-only JSON lines at `/opt/homelab/events/YYYY-MM-DD/chelsty/events.jsonl`.
+*   **Events**: Append-only JSON lines at `/opt/homelab/events/YYYY-MM-DD/chelsty-infra/events.jsonl`.
 
 #### Deployment
 
diff --git a/inventory/topology.yaml b/inventory/topology.yaml
index c5adabd..7a1046a 100644
--- a/inventory/topology.yaml
+++ b/inventory/topology.yaml
@@ -28,11 +28,12 @@ nodes:
       - edge
       - ingress
 
-  chelsty:
+  chelsty-infra:
+    site: chelsty
     roles:
       - remote
       - hypervisor
-      - homeassistant
+      - infra
       - staging
     connectivity:
       uplink: lte
@@ -40,10 +41,22 @@ nodes:
     home_automation:
       offline_operation_required: true
       services:
-        - homeassistant
         - zigbee2mqtt
         - mosquitto
       coordinator:
         model: SLZB-06U
         connection: network
         usb: false
+
+  chelsty-ha:
+    site: chelsty
+    roles:
+      - remote
+      - homeassistant
+    connectivity:
+      uplink: lte
+      intermittent: true
+    home_automation:
+      offline_operation_required: true
+      services:
+        - homeassistant