diff --git a/config/packages/garadget.yaml b/config/packages/garadget.yaml
index 69ac3713..e651ac54 100755
--- a/config/packages/garadget.yaml
+++ b/config/packages/garadget.yaml
@@ -413,33 +413,17 @@ automation:
         from: 'home'    
 
     action:
-      - choose:
-          - conditions: "{{ is_state('binary_sensor.sleepnumber_carlo_stacey_is_in_bed','on') }}"
-            sequence:
-              - service: media_player.play_media
-                data:
-                  entity_id: media_player.stacey_bedroom
-                  media_content_id: 'show garage camera from home assistant'
-                  media_content_type: custom
-              - delay: '00:10:00'
-              - service: media_player.play_media
-                data:
-                  entity_id: media_player.stacey_bedroom
-                  media_content_id: 'hide garage camera'
-                  media_content_type: custom
-
-        default:
-          - service: media_player.play_media
-            target:
-              entity_id: media_player.kitchen
-            data:
-              media_content_id: 'show garage camera from home assistant'
-              media_content_type: custom
-          - delay: '00:20:00'
-          - service: media_player.play_media
-            target:
-              entity_id: media_player.kitchen
-            data:
-              media_content_id: 'hide garage camera'
-              media_content_type: custom
+      - service: media_player.play_media
+        target:
+          entity_id: media_player.kitchen
+        data:
+          media_content_id: 'show garage camera from home assistant'
+          media_content_type: custom
+      - delay: '00:20:00'
+      - service: media_player.play_media
+        target:
+          entity_id: media_player.kitchen
+        data:
+          media_content_id: 'hide garage camera'
+          media_content_type: custom
 
diff --git a/config/packages/vacuum.yaml b/config/packages/vacuum.yaml
index 3c7909a6..cc01ef6c 100755
--- a/config/packages/vacuum.yaml
+++ b/config/packages/vacuum.yaml
@@ -168,6 +168,9 @@ automation:
       - condition: template
         value_template: "{{ not is_state('vacuum.l10s_vacuum', 'cleaning') }}"
     action:
+      - service: input_boolean.turn_on
+        target:
+          entity_id: input_boolean.l10s_vacuum_on_demand
       - service: script.l10s_vacuum_start_next_room
 
   - alias: 'Away Vacuum: Dock When Family Returns'
@@ -232,6 +235,9 @@ automation:
       - condition: state
         entity_id: vacuum.l10s_vacuum
         state: 'cleaning'
+      - condition: state
+        entity_id: input_boolean.l10s_vacuum_on_demand
+        state: 'on'
 
     action:
       - service: input_text.set_value
@@ -300,6 +306,9 @@ automation:
                   entity_id: input_text.l10s_vacuum_room_queue
                 data:
                   value: ""
+              - service: input_boolean.turn_off
+                target:
+                  entity_id: input_boolean.l10s_vacuum_on_demand
               - service: script.l10s_vacuum_start_next_room
 
   - alias: 'Vacuum Sensor Cleaning Silencer'