diff --git a/configuration/automations/alarm.yaml b/configuration/automations/alarm.yaml
index 508e482..5039f3d 100644
--- a/configuration/automations/alarm.yaml
+++ b/configuration/automations/alarm.yaml
@@ -14,6 +14,12 @@
     - platform: state
       entity_id: binary_sensor.kitchen_motion_sensor
       to: 'on'
+    - platform: state
+      entity_id: binary_sensor.kitchen_tabletop_motion_detection
+      to: 'on'
+    - platform: state
+      entity_id: binary_sensor.sink_motion_sensor
+      to: 'on'
     - platform: state
       entity_id: binary_sensor.shower_motion
       to: 'on'
@@ -91,19 +97,6 @@
     - service: alarm_control_panel.alarm_arm_away
       entity_id: alarm_control_panel.ha_alarm
 
-- id: alarm-disarm
-  alias: '[Alarm] Disarm'
-  trigger:
-    - platform: zone
-      entity_id: device_tracker.przemyslaws_iphone
-      zone: zone.home
-      event: enter
-  action:
-    - service: alarm_control_panel.alarm_arm_away
-      entity_id: alarm_control_panel.ha_alarm
-    - service: switch.turn_off
-      entity_id: switch.siren_switch
-
 - id: alarm-pending
   alias: '[Alarm] Send notification when alarm triggered'
   trigger:
diff --git a/configuration/automations/kitchen-motion.yaml b/configuration/automations/kitchen-motion.yaml
index 5637c44..19d8566 100644
--- a/configuration/automations/kitchen-motion.yaml
+++ b/configuration/automations/kitchen-motion.yaml
@@ -64,7 +64,7 @@
       from: 'on'
       to: 'off'
     - platform: state
-      entity_id: binary_sensor.sink_motion_sensor_5473a923_ias_zone
+      entity_id: binary_sensor.sink_motion_sensor
       to: 'off'
       for: '0:02:00'
     - platform: state
@@ -77,7 +77,7 @@
       state: 'off'
       for: '0:02:00'
     - condition: state
-      entity_id: binary_sensor.sink_motion_sensor_5473a923_ias_zone
+      entity_id: binary_sensor.sink_motion_sensor
       state: 'off'
       for: '0:02:00'
     - condition: state
@@ -93,7 +93,7 @@
   mode: single
   trigger:
     - platform: state
-      entity_id: binary_sensor.sink_motion_sensor_5473a923_ias_zone
+      entity_id: binary_sensor.sink_motion_sensor
       to: 'off'
       for: '0:05:00'
   condition: [ ]