diff --git a/configuration/automations/alarm.yaml b/configuration/automations/alarm.yaml
index d582247..df629bc 100644
--- a/configuration/automations/alarm.yaml
+++ b/configuration/automations/alarm.yaml
@@ -1,16 +1,40 @@
-- id: alarm-away
-  alias: '[Alarm] Trigger alarm when not at home'
+- id: alarm-away-hallway
+  alias: '[Alarm] Trigger alarm when not at home - Hallway camera'
   trigger:
-# Use all motion sensors
-    - platform: state
-      entity_id: binary_sensor.bathroom_motion_occupancy
-      to: 'on'
-    - platform: state
-      entity_id: binary_sensor.bedroom_motion_occupancy
-      to: 'on'
+    # Use hallway motion sensor
     - platform: state
       entity_id: binary_sensor.hallway_motion_sensor
       to: 'on'
+    # Use open/close sensors
+    - platform: state
+      entity_id: binary_sensor.bathroom_door_open_close
+      to: 'on'
+    - platform: state
+      entity_id: binary_sensor.front_door_open_close
+      to: 'on'
+    # Use lock
+    - platform: state
+      entity_id: lock.front_door_lock_doorlock
+      to: 'unlocked'
+  condition:
+    - condition: state
+      entity_id: alarm_control_panel.home_alarm
+      state: armed_away
+  action:
+    - service: alarm_control_panel.alarm_trigger
+      entity_id: alarm_control_panel.home_alarm
+    - service: notify.mobile_app_iphone
+      data:
+        message: Alarm in hallway
+        data:
+          entity_id: camera.hallway
+          url:
+            _: "/lovelace-tablet/cctv"
+
+- id: alarm-away-living-roomn
+  alias: '[Alarm] Trigger alarm when not at home (Living Room)'
+  trigger:
+# Use motion sensors
     - platform: state
       entity_id: binary_sensor.kitchen_motion_sensor
       to: 'on'
@@ -20,16 +44,7 @@
     - platform: state
       entity_id: binary_sensor.kitchen_sink_motion_sensor
       to: 'on'
-    - platform: state
-      entity_id: binary_sensor.shower_motion
-      to: 'on'
 # Use open/close sensors
-    - platform: state
-      entity_id: binary_sensor.bathroom_door_open_close
-      to: 'on'
-    - platform: state
-      entity_id: binary_sensor.bedroom_window_open_close
-      to: 'on'
     - platform: state
       entity_id: binary_sensor.dining_window_1_open_close
       to: 'on'
@@ -45,10 +60,6 @@
     - platform: state
       entity_id: binary_sensor.office_window_open_close
       to: 'on'
-# Use lock
-    - platform: state
-      entity_id: lock.front_door_lock_doorlock
-      to: 'unlocked'
   condition:
     - condition: state
       entity_id: alarm_control_panel.home_alarm
@@ -56,6 +67,44 @@
   action:
     - service: alarm_control_panel.alarm_trigger
       entity_id: alarm_control_panel.home_alarm
+    - service: notify.mobile_app_iphone
+      data:
+        message: Alarm in Living Room !
+        data:
+          entity_id: camera.living_room
+          url:
+            _: "/lovelace-tablet/cctv"
+
+- id: alarm-away-remaining
+  alias: '[Alarm] Trigger alarm when not at home'
+  trigger:
+# Use motion sensors
+    - platform: state
+      entity_id: binary_sensor.bathroom_motion_occupancy
+      to: 'on'
+    - platform: state
+      entity_id: binary_sensor.bedroom_motion_occupancy
+      to: 'on'
+    - platform: state
+      entity_id: binary_sensor.shower_motion
+      to: 'on'
+# Use open/close sensors
+    - platform: state
+      entity_id: binary_sensor.bedroom_window_open_close
+      to: 'on'
+  condition:
+    - condition: state
+      entity_id: alarm_control_panel.home_alarm
+      state: armed_away
+  action:
+    - service: alarm_control_panel.alarm_trigger
+      entity_id: alarm_control_panel.home_alarm
+    - service: notify.mobile_app_iphone
+      data:
+        message: Alarm triggered
+        data:
+          url:
+            _: "/lovelace-tablet/cctv"
 
 - id: alarm-night
   alias: '[Alarm] Trigger alarm at night'