diff --git a/configuration/automations/alarm-clock.yaml b/configuration/automations/alarm-clock.yaml
index c34b39a..0b8ab49 100644
--- a/configuration/automations/alarm-clock.yaml
+++ b/configuration/automations/alarm-clock.yaml
@@ -6,17 +6,13 @@
       to: 'on'
   action:
     - service: script.good_morning
-    - delay: '15'
+    - delay:
+        minutes: 30
     - service: media_player.volume_set
       data:
         volume_level: 0.1
         entity_id: media_player.bedroom
-    - service: media_player.play_media
-      data:
-        media_content_id: media-source://media_source/local/wake-the-f-up-samurai-we-have-a-city-to-burn.mp3
-        media_content_type: music
-      entity_id: media_player.bedroom_speaker
-    - delay: '15'
+    - delay: '10'
     - service: media_player.play_media
       data:
         entity_id: media_player.bedroom
diff --git a/scripts/10.modes.yaml b/scripts/10.modes.yaml
index f8f2bc6..88b3733 100644
--- a/scripts/10.modes.yaml
+++ b/scripts/10.modes.yaml
@@ -58,6 +58,22 @@ good_night:
 good_morning:
   alias: Good Morning
   sequence:
+    - service: light.turn_on
+      data:
+        kelvin: 2000
+        brightness: 1
+      entity_id: light.bedroom_lights
+    - service: cover.set_cover_position
+      target:
+        entity_id: cover.living_room_blind
+      data:
+        position: 10
+    - service: light.turn_on
+      data:
+        kelvin: 5300
+        transition: 1800
+        brightness: 255
+      entity_id: light.bedroom_lights
     - service: cover.open_cover
       entity_id:
         - cover.bedroom_blinds
@@ -70,9 +86,7 @@ good_morning:
         option: Day
       entity_id: input_select.home_mode
     - service: switch.turn_on
-      entity_id:
-        - switch.desk_motor_on_off
-        - switch.computer_outlet
+      entity_id: switch.computer_outlet
     - service: switch.turn_off
       entity_id: switch.mute_doorbell
   mode: single