diff --git a/packages/functions/music.yaml b/packages/functions/music.yaml
index 0064b3b..ca91663 100644
--- a/packages/functions/music.yaml
+++ b/packages/functions/music.yaml
@@ -4,11 +4,13 @@ script:
     sequence:
       - service: media_player.volume_set
         entity_id: media_player.master_bedroom
-        data:
-          volume_level: 0.3
+        data_template:
+          volume_level: "{{ volume | default(0.3) }}"
+      - service: media_player.shuffle_set
+        entity_id: media_player.master_bedroom
+        data_template:
+          shuffle: "{{ shuffle | default(true) }}"
       - service: media_player.select_source
         entity_id: media_player.master_bedroom
-        data:
-          source: "Evening Chill"
-      - service: fan.turn_off
-        entity_id: fan.philips_airpurifier
+        data_template:
+          source: "{{ playlist | default('Evening Chill') }}"
diff --git a/packages/routines/waking_up.yaml b/packages/routines/waking_up.yaml
index baebd3e..76a278b 100644
--- a/packages/routines/waking_up.yaml
+++ b/packages/routines/waking_up.yaml
@@ -2,6 +2,8 @@ script:
   routine_waking_up:
     alias: Routine - Waking up
     sequence:
+      - service: fan.turn_off
+        entity_id: fan.philips_airpurifier
       - service: script.routine_morning_briefing
       - delay: 00:00:35
       - service: script.say