diff --git a/packages/alexa.yaml b/packages/alexa.yaml
index f46488c..6bee4c2 100644
--- a/packages/alexa.yaml
+++ b/packages/alexa.yaml
@@ -170,7 +170,7 @@ automation:
         then:
         - service: script.status_annc
           data:
-            who: "{{ states('sensor.last_alexa_entity_id') }}"
+            who: "living_room"
             call_security_not_armed: 1
 
 script:
diff --git a/scripts.yaml b/scripts.yaml
index c9859dd..044f0e0 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -79,7 +79,7 @@ give_me_darkness:
           text: <voice name='Joanna'><prosody rate='150%'>Would you like me to arm
             the security system?</prosody></voice>
           event_id: actionable_notification_night_security_arm
-          alexa_device: '{{ states(''sensor.last_alexa_entity_id'') }}'
+          alexa_device: media_player.living_room_echo_dot
         alias: Ask to arm security
   mode: single
   icon: mdi:weather-night