diff --git a/scripts/10.modes.yaml b/scripts/10.modes.yaml
index c454b6f..af44f3a 100644
--- a/scripts/10.modes.yaml
+++ b/scripts/10.modes.yaml
@@ -12,10 +12,10 @@ good_night:
       data:
         option: Night
       entity_id: input_select.home_mode
-    - service: script.bedroom_lights_off
     - service: script.cctv_on
     - service: alarm_control_panel.alarm_arm_home
       entity_id: alarm_control_panel.home_alarm
+    - service: script.bedroom_lights_off
     - choose:
         - conditions:
             - condition: state
@@ -105,6 +105,12 @@ good_morning:
   mode: single
   icon: mdi:weather-sunny
   sequence:
+    - service: alarm_control_panel.alarm_disarm
+      entity_id: alarm_control_panel.home_alarm
+    - service: input_select.select_option
+      data:
+        option: Day
+      entity_id: input_select.home_mode
     - service: input_boolean.turn_on
       target:
         entity_id: input_boolean.meal_alert
@@ -117,12 +123,6 @@ good_morning:
         - cover.bedroom_blinds
         - cover.dining_blinds
         - cover.office_blinds
-    - service: alarm_control_panel.alarm_disarm
-      entity_id: alarm_control_panel.home_alarm
-    - service: input_select.select_option
-      data:
-        option: Day
-      entity_id: input_select.home_mode
     - service: switch.turn_on
       entity_id:
         - switch.computer_outlet
@@ -167,13 +167,13 @@ leave_home:
   mode: single
   icon: mdi:home-export-outline
   sequence:
-    - service: script.cctv_on
     - service: alarm_control_panel.alarm_arm_away
       entity_id: alarm_control_panel.home_alarm
     - service: input_select.select_option
       data:
         option: Away
       entity_id: input_select.home_mode
+    - service: script.cctv_on
     - choose:
         - conditions:
             - condition: state
@@ -245,13 +245,13 @@ arrive_home:
   mode: single
   icon: mdi:home-import-outline
   sequence:
-    - service: script.cctv_off
     - service: alarm_control_panel.alarm_disarm
       entity_id: alarm_control_panel.home_alarm
     - service: input_select.select_option
       data:
         option: Day
       entity_id: input_select.home_mode
+    - service: script.cctv_off
     - service: switch.turn_on
       entity_id:
         - switch.computer_outlet