diff --git a/automations/files/automations/alarm-clock.yaml b/automations/files/automations/alarm-clock.yaml
index d618bc4..c5dcdaa 100644
--- a/automations/files/automations/alarm-clock.yaml
+++ b/automations/files/automations/alarm-clock.yaml
@@ -28,7 +28,7 @@
     - delay: 0:30:00
     - service: media_player.volume_set
       data:
-        volume_level: 0.6
+        volume_level: 0.1
       entity_id: media_player.bedroom_speaker
     - service: media_player.play_media
       data:
@@ -40,7 +40,17 @@
       data:
         device_name: Bedroom speaker
         uri: 'spotify:playlist:71mXIu6HcdVj3fAMduaHop'
-        random_song: true
+    - repeat:
+        until:
+          - condition: numeric_state
+            entity_id: media_player.bedroom_speaker
+            attribute: volume_level
+            above: '90'
+        sequence:
+          - delay: '30'
+          - service: media_player.volume_up
+            entity_id: media_player.bedroom_speaker
+
   mode: single
 - id: alarm-update-time
   alias: '[Alarm] Update alarm time'