diff --git a/ansible/roles/podman/files/hass/automations.yaml b/ansible/roles/podman/files/hass/automations.yaml
index 13969e0..aee6a0b 100644
--- a/ansible/roles/podman/files/hass/automations.yaml
+++ b/ansible/roles/podman/files/hass/automations.yaml
@@ -195,11 +195,12 @@
   description: TV mode on; once it's dark, dim the living room and turn off the
     lights that glare on the TV
   triggers:
-  - type: turned_on
-    device_id: 18a9bb7a2a32be4371da447767ef50a9
-    entity_id: c05688f2610e27e2d86380e2945ceae5
-    domain: remote
-    trigger: device
+  - trigger: state
+    entity_id: remote.samsung_tv
+    to: 'on'
+    not_from:
+    - unavailable
+    - unknown
   conditions: []
   actions:
   - action: input_boolean.turn_on
@@ -232,11 +233,12 @@
     scheduled level; late night (23:30 to sunrise) only turns off the TV glow;
     daytime leaves the lights alone
   triggers:
-  - type: turned_off
-    device_id: 18a9bb7a2a32be4371da447767ef50a9
-    entity_id: c05688f2610e27e2d86380e2945ceae5
-    domain: remote
-    trigger: device
+  - trigger: state
+    entity_id: remote.samsung_tv
+    to: 'off'
+    not_from:
+    - unavailable
+    - unknown
   conditions: []
   actions:
   - action: input_boolean.turn_off
@@ -268,7 +270,7 @@
 - id: driveway_lights_on
   alias: Driveway String Lights On
   description: On 1 hour before sunset whether or not the TV is on. Also catches
-    up if Home Assistant restarts or the switch reconnects before the 23:00 off
+    up if Home Assistant restarts before the 23:00 off
   triggers:
   - trigger: sun
     event: sunset
@@ -276,10 +278,6 @@
     id: sunset
   - trigger: homeassistant
     event: start
-  - trigger: state
-    entity_id: switch.driveway_string_lights
-    from: unavailable
-    to: 'off'
   conditions:
   - condition: state
     entity_id: switch.driveway_string_lights
@@ -399,11 +397,12 @@
   alias: Bedroom On
   description: ''
   triggers:
-  - type: turned_on
-    device_id: afb9734fe9b187ab6881a64d24e1c2f5
-    entity_id: 27efa149b9ebb388e7c21ba89e671b42
-    domain: switch
-    trigger: device
+  - trigger: state
+    entity_id: switch.bedroom_light
+    to: 'on'
+    not_from:
+    - unavailable
+    - unknown
   conditions: []
   actions:
   - action: light.turn_on
@@ -417,11 +416,12 @@
   alias: Bedroom Off
   description: ''
   triggers:
-  - type: turned_off
-    device_id: afb9734fe9b187ab6881a64d24e1c2f5
-    entity_id: 27efa149b9ebb388e7c21ba89e671b42
-    domain: switch
-    trigger: device
+  - trigger: state
+    entity_id: switch.bedroom_light
+    to: 'off'
+    not_from:
+    - unavailable
+    - unknown
   conditions: []
   actions:
   - action: light.turn_off