diff --git a/config/packages/routines/bedtime.yaml b/config/packages/routines/bedtime.yaml
index bd30dc0..33eba03 100644
--- a/config/packages/routines/bedtime.yaml
+++ b/config/packages/routines/bedtime.yaml
@@ -1,7 +1,6 @@
 script:
   routine_bedroom_bedtime:
     alias: Routine · Bedroom · Bedtime
-    continue_on_error: true
     sequence:
       - service: sonos.unjoin
         entity_id:
diff --git a/config/packages/routines/coming_home.yaml b/config/packages/routines/coming_home.yaml
index 16c38c7..5873077 100644
--- a/config/packages/routines/coming_home.yaml
+++ b/config/packages/routines/coming_home.yaml
@@ -7,7 +7,6 @@ input_boolean:
 script:
   routine_coming_home:
     alias: Routine · Coming home
-    continue_on_error: true
     sequence:
       - service: input_select.select_option
         entity_id: input_select.hallway_dashboard_mode
@@ -58,13 +57,12 @@ script:
   routine_coming_home_after_sunset:
     alias: Routine · Coming home · After sunset
     sequence:
-      - condition: or
-        conditions:
-          - condition: sun
-            after: sunset
-            after_offset: "-01:00:00"
-          - condition: sun
-            before: sunrise
+      - or:
+        - condition: sun
+          after: sunset
+          after_offset: "-01:00:00"
+        - condition: sun
+          before: sunrise
       - service: notify.telegram
         data:
           title: "🏠 *Presence Module · Coming Home*"
diff --git a/config/packages/routines/good_night.yaml b/config/packages/routines/good_night.yaml
index fcfeb6b..ac332fb 100644
--- a/config/packages/routines/good_night.yaml
+++ b/config/packages/routines/good_night.yaml
@@ -1,7 +1,6 @@
 script:
   bedroom_good_night:
     alias: Routine · Bedroom · Going to sleep
-    continue_on_error: true
     sequence:
       - service: sonos.unjoin
         entity_id: media_player.master_bedroom
diff --git a/config/packages/routines/leaving_home.yaml b/config/packages/routines/leaving_home.yaml
index 97d777d..8c3f708 100644
--- a/config/packages/routines/leaving_home.yaml
+++ b/config/packages/routines/leaving_home.yaml
@@ -1,7 +1,6 @@
 script:
   routine_leaving_home:
     alias: Routine · Leaving home
-    continue_on_error: true
     sequence:
 
       - service: homeassistant.turn_off
diff --git a/config/packages/routines/waking_up.yaml b/config/packages/routines/waking_up.yaml
index a29c0d6..1c9757b 100644
--- a/config/packages/routines/waking_up.yaml
+++ b/config/packages/routines/waking_up.yaml
@@ -1,7 +1,6 @@
 script:
   routine_waking_up:
     alias: Routine · Waking up
-    continue_on_error: true
     sequence:
       - service: light.turn_on
         entity_id: light.hallway