diff --git a/scripts.yaml b/scripts.yaml
index 571e622..2984d35 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -129,15 +129,12 @@ stop_spotify:
 goodnight:
   alias: Goodnight
   sequence:
-  - service: scene.turn_on
+  - service: switch.turn_on
+    data: {}
     target:
-      entity_id:
-      - scene.upstairs_hallway_nightlight
+      entity_id: switch.adaptive_lighting_sleep_mode_upstairs_hallway
   - service: light.turn_off
     target:
-      device_id:
-      - cfa5796f2572082c37db92f809e432bc
-      - 3ccbb8face40bff22fd924966bbb19f5
       area_id:
       - basement_studio
       - master_bedroom
@@ -145,16 +142,20 @@ goodnight:
       - furnace_room
       - mud_room
       - nursery
+      - living_room
+    data: {}
   - service: switch.turn_off
     target:
       area_id:
       - basement_studio
       entity_id: switch.dining_room_lamp
+    data: {}
   - service: switch.turn_on
     target:
       entity_id:
       - switch.basement_echo_dot_do_not_disturb_switch
       - switch.living_room_echo_dot_do_not_disturb_switch
+    data: {}
   mode: single
   icon: mdi:weather-night
 alexa_tts_test:
@@ -328,3 +329,19 @@ max_brightness:
   mode: single
   alias: Max Brightness
   icon: mdi:brightness-7
+going_upstairs:
+  alias: Going Upstairs
+  sequence:
+  - service: switch.turn_off
+    data: {}
+    target:
+      entity_id:
+      - switch.adaptive_lighting_sleep_mode_basement_studio
+      - switch.adaptive_lighting_sleep_mode_mud_room
+      - switch.adaptive_lighting_sleep_mode_upstairs_hallway
+  - service: light.turn_on
+    data: {}
+    target:
+      entity_id: light.living_room_lights
+  mode: single
+  icon: hue:room-stairs