diff --git a/config/automation/late_night_outside_helper.yaml b/config/automation/late_night_outside_helper.yaml
index c959c2f9..31280113 100755
--- a/config/automation/late_night_outside_helper.yaml
+++ b/config/automation/late_night_outside_helper.yaml
@@ -8,6 +8,8 @@
   trigger:
     - platform: state
       entity_id: group.garage_doors
+    - platform: state
+      entity_id: binary_sensor.mcu1_gpio5 #front door
     - platform: state
       entity_id: sun.sun
       to: 'below_horizon'
@@ -45,8 +47,8 @@
         - switch.back_landscaping
         - switch.front_door_outlet
         - switch.foyer_outlet
-    - wait_template: >-
-        {{ states.group.garage_doors.state == 'closed' }}
+    - wait_template: "{{ is_state('states.group.entry_points.state', 'off') }}"
+    - wait_template: "{{ is_state( 'group.garage_doors', 'closed') }}"
     - service: script.monthly_color_scene
     - choose:
         - conditions: >