diff --git a/config/packages/routines/bedtime.yaml b/config/packages/routines/bedtime.yaml
index f0c1593..a575ee2 100644
--- a/config/packages/routines/bedtime.yaml
+++ b/config/packages/routines/bedtime.yaml
@@ -35,8 +35,10 @@ script:
         entity_id:
           - media_player.nvidia_shield
           - media_player.living_room_tv
-          - light.ceiling
-          - light.kitchen
+          - light.master_bedroom_main
+          - light.living_room_ceiling
+          - light.kitchen_main
+          - light.kitchen_secondary
           - light.hallway_main
           - light.hallway_entrance
           - switch.titanium
diff --git a/config/packages/routines/good_night.yaml b/config/packages/routines/good_night.yaml
index 8b89e6d..1977fb4 100644
--- a/config/packages/routines/good_night.yaml
+++ b/config/packages/routines/good_night.yaml
@@ -25,10 +25,10 @@ script:
           option: "sleep"
       - service: homeassistant.turn_off
         entity_id:
-          - light.all
+          - light.living_room
+          - light.master_bedroom
           - light.kitchen
-          - light.hallway_main
-          - light.hallway_entrance
+          - light.hallway
           - media_player.nvidia_shield
           - media_player.living_room_tv
           - switch.titanium