diff --git a/config/automation/Timed_Triggers/0830.yaml b/config/automation/Timed_Triggers/0830.yaml
index 1cf798b4..36cab716 100755
--- a/config/automation/Timed_Triggers/0830.yaml
+++ b/config/automation/Timed_Triggers/0830.yaml
@@ -27,6 +27,7 @@
   action:
     - wait_template: >-
        {{ is_state('group.garage_doors', 'open') }}
+    - delay: 00:03:00
     - service: light.turn_off
       entity_id:
         - group.all_lights
diff --git a/config/automation/good_morning.yaml b/config/automation/good_morning.yaml
index c90ab0e9..33e96e35 100755
--- a/config/automation/good_morning.yaml
+++ b/config/automation/good_morning.yaml
@@ -12,6 +12,7 @@
       entity_id:
         - binary_sensor.sleepnumber_carlo_stacey_is_in_bed
       to: 'off'
+      for: '00:05:00'
 
   condition:
     - condition: state
@@ -21,8 +22,8 @@
       entity_id: input_boolean.school_mode
       state: 'on'
     - condition: time
-      after: '06:00:00'
-      before: '10:00:00'
+      after: '05:30:00'
+      before: '08:00:00'
     - condition: time
       weekday:
         - mon
@@ -32,7 +33,6 @@
         - fri
 
   action:
-    - delay: 00:20:00
     - service: light.turn_on
       entity_id:
         - light.s1