diff --git a/configuration/automations/alarm.yaml b/configuration/automations/alarm.yaml
index df629bc..0d6c033 100644
--- a/configuration/automations/alarm.yaml
+++ b/configuration/automations/alarm.yaml
@@ -25,7 +25,9 @@
       entity_id: alarm_control_panel.home_alarm
     - service: notify.mobile_app_iphone
       data:
-        message: Alarm in hallway
+        title: "ALARM! Pending for disarm"
+        message: >
+          {{ state_attr(trigger.entity_id, 'friendly_name') }}
         data:
           entity_id: camera.hallway
           url:
@@ -34,7 +36,7 @@
 - id: alarm-away-living-roomn
   alias: '[Alarm] Trigger alarm when not at home (Living Room)'
   trigger:
-# Use motion sensors
+    # Use motion sensors
     - platform: state
       entity_id: binary_sensor.kitchen_motion_sensor
       to: 'on'
@@ -44,7 +46,7 @@
     - platform: state
       entity_id: binary_sensor.kitchen_sink_motion_sensor
       to: 'on'
-# Use open/close sensors
+    # Use open/close sensors
     - platform: state
       entity_id: binary_sensor.dining_window_1_open_close
       to: 'on'
@@ -69,7 +71,9 @@
       entity_id: alarm_control_panel.home_alarm
     - service: notify.mobile_app_iphone
       data:
-        message: Alarm in Living Room !
+        title: "ALARM! Pending for disarm"
+        message: >
+          {{ state_attr(trigger.entity_id, 'friendly_name') }}
         data:
           entity_id: camera.living_room
           url:
@@ -78,7 +82,7 @@
 - id: alarm-away-remaining
   alias: '[Alarm] Trigger alarm when not at home'
   trigger:
-# Use motion sensors
+    # Use motion sensors
     - platform: state
       entity_id: binary_sensor.bathroom_motion_occupancy
       to: 'on'
@@ -88,7 +92,7 @@
     - platform: state
       entity_id: binary_sensor.shower_motion
       to: 'on'
-# Use open/close sensors
+    # Use open/close sensors
     - platform: state
       entity_id: binary_sensor.bedroom_window_open_close
       to: 'on'
@@ -101,7 +105,9 @@
       entity_id: alarm_control_panel.home_alarm
     - service: notify.mobile_app_iphone
       data:
-        message: Alarm triggered
+        title: "ALARM! Pending for disarm"
+        message: >
+          {{ state_attr(trigger.entity_id, 'friendly_name') }}
         data:
           url:
             _: "/lovelace-tablet/cctv"
@@ -134,6 +140,14 @@
   action:
     - service: alarm_control_panel.alarm_trigger
       entity_id: alarm_control_panel.home_alarm
+    - service: notify.mobile_app_iphone
+      data:
+        title: "ALARM! Pending for disarm"
+        message: >
+          {{ state_attr(trigger.entity_id, 'friendly_name') }}
+        data:
+          url:
+            _: "/lovelace-tablet/cctv"
 
 - id: alarm-arm-away
   alias: '[Alarm] Arm away'
@@ -153,11 +167,6 @@
       entity_id: alarm_control_panel.home_alarm
       to: 'pending'
   action:
-    - service: notify.notify
-      data:
-        message: "ALARM! Pending for disarm"
-        data:
-          importance: max
     - service: zwave_js.set_config_parameter
       data:
         parameter: '7'