diff --git a/automations/files/alarm-clock.yaml b/automations/files/alarm-clock.yaml
index 61c57d2..74f5355 100644
--- a/automations/files/alarm-clock.yaml
+++ b/automations/files/alarm-clock.yaml
@@ -4,11 +4,6 @@
   trigger:
     - platform: time
       at: input_datetime.alarm
-  condition:
-    - condition: state
-      entity_id: sensor.sm_g965f_next_alarm
-      state: ' com.urbandroid.sleep '
-      attribute: Package
   action:
     - service: light.turn_on
       data:
@@ -59,6 +54,10 @@
         - condition: state
           entity_id: sensor.sm_g965f_next_alarm
           state: unknown
+    - condition: state
+      entity_id: sensor.sm_g965f_next_alarm
+      state: ' com.urbandroid.sleep'
+      attribute: Package
   action:
     - service: input_datetime.set_datetime
       entity_id: input_datetime.alarm
diff --git a/automations/files/vacuum.yaml b/automations/files/vacuum.yaml
index c95e11e..fee0b4d 100644
--- a/automations/files/vacuum.yaml
+++ b/automations/files/vacuum.yaml
@@ -1,5 +1,5 @@
 - id: vacuum_leave
-  alias: '[Vaccum] Clean after leaving home'
+  alias: '[Vacuum] Clean after leaving home'
   trigger:
     - platform: zone
       entity_id: device_tracker.sm_g965f
@@ -13,7 +13,7 @@
   mode: single
 
 - id: vacuum_arive
-  alias: '[Vaccum] Stop cleaning after arrival'
+  alias: '[Vacuum] Stop cleaning after arrival'
   trigger:
     - platform: zone
       entity_id: device_tracker.sm_g965f
@@ -21,7 +21,9 @@
       event: enter
   condition: []
   action:
+    - service: vacuum.pause
+      entity_id: vacuum.robot_vacuum
+    - delay: '15'
     - service: vacuum.return_to_base
-      data: {}
       entity_id: vacuum.robot_vacuum
   mode: single
\ No newline at end of file