diff --git a/configuration/automations/vacuum.yaml b/configuration/automations/vacuum.yaml
index ed6c80a..571681d 100644
--- a/configuration/automations/vacuum.yaml
+++ b/configuration/automations/vacuum.yaml
@@ -1,10 +1,9 @@
 - id: vacuum_leave
   alias: '[Vacuum] Clean after leaving home'
   trigger:
-    - platform: zone
-      entity_id: device_tracker.sm_g965f
-      zone: zone.home
-      event: leave
+    - platform: state
+      entity_id: input_select.home_mode
+      to: Away
   action:
     - service: vacuum.start
       entity_id: vacuum.robot_vacuum
@@ -13,14 +12,15 @@
 - id: vacuum_arive
   alias: '[Vacuum] Stop cleaning after arrival'
   trigger:
-    - platform: zone
-      entity_id: device_tracker.sm_g965f
-      zone: zone.home
-      event: enter
+    - platform: state
+      entity_id: input_select.home_mode
+      from: Away
+      to: Home
   action:
     - service: vacuum.pause
       entity_id: vacuum.robot_vacuum
-    - delay: '15'
+    - delay:
+        seconds: 15
     - service: vacuum.return_to_base
       entity_id: vacuum.robot_vacuum
   mode: single
\ No newline at end of file