diff --git a/infra/compose.yaml b/infra/compose.yaml
index d1dcda6..18bf841 100644
--- a/infra/compose.yaml
+++ b/infra/compose.yaml
@@ -80,7 +80,7 @@ services:
 
   # Listens to ntfy.sh for doorbell events and toggles a smart plug on each alert.
   # Topic: ALERT_klubhaus_topic_test (matches ESP32 firmware DEBUG_MODE suffix)
-  # Action: TOGGLE on zigbee2mqtt/Sideboard Lamp/set
+  # Action: TOGGLE on zigbee2mqtt/Squiggle/set
   # On a fresh alert, flash the plug: N toggles spaced FLASH_INTERVAL_SECONDS
   # so the total runtime is FLASH_DURATION_SECONDS.
   doorbell-listener:
@@ -95,7 +95,7 @@ services:
     environment:
       MQTT_HOST: mosquitto
       MQTT_PORT: "1883"
-      PLUG_TOPIC: "zigbee2mqtt/Sideboard Lamp/set"
+      PLUG_TOPIC: "zigbee2mqtt/Squiggle/set"
       POLL_INTERVAL: "5"
       MAX_AGE_SECONDS: "180"
       FLASH_INTERVAL_SECONDS: "1"
diff --git a/justfile b/justfile
index 5dc7e1c..a2ddca1 100644
--- a/justfile
+++ b/justfile
@@ -172,7 +172,7 @@ zigbee-devices:
 
 # Show per-device persisted state (on/off, brightness, etc.)
 zigbee-state:
-    ssh {{RPI_HOST}} 'cat {{RPI_DIR}}/zigbee2mqtt/state.json' | python3 -m json.tool | head -60
+    ssh {{RPI_HOST}} 'cat {{RPI_DIR}}/nr-flow-validator/infra/zigbee2mqtt/state.json' | python3 -m json.tool | head -60
 
 # ============================================================
 # MQTT — publish, subscribe, watch, simulate devices