diff --git a/configuration/automations/alarm.yaml b/configuration/automations/alarm.yaml
index 64537c2..e5da1fe 100644
--- a/configuration/automations/alarm.yaml
+++ b/configuration/automations/alarm.yaml
@@ -140,7 +140,6 @@
           images:
             - "/config/www/cctv/living_room.mp4"
 
-
 - id: alarm_away_bedroom
   alias: '[Alarm] Trigger alarm when not at home (Bedroom)'
   trigger:
@@ -326,4 +325,4 @@
       target:
         entity_id: switch.siren_alarm
     - service: switch.turn_on
-      entity_id: switch.siren_switch
\ No newline at end of file
+      entity_id: switch.siren_switch
diff --git a/templates/low-battery.yaml.j2 b/templates/low-battery.yaml.j2
index c5a6af5..30fb709 100644
--- a/templates/low-battery.yaml.j2
+++ b/templates/low-battery.yaml.j2
@@ -23,8 +23,9 @@
         - {{ entity }}
 {% endfor %}
   action:
-    - service: notify.mobile_app_iphone
+    - service: notify.home_assistant
       data:
-        title: "Low battery"
         message: >
+          Low battery
           {% raw %}{{ device_attr(trigger.entity_id, 'name_by_user') }} has low battery {{ states(trigger.entity_id) }}% {% endraw %}
+          target: [ "1070507369164984372" ]
diff --git a/templates/unavailable-zha.yaml.j2 b/templates/unavailable-zha.yaml.j2
index 786a92a..03c63a7 100644
--- a/templates/unavailable-zha.yaml.j2
+++ b/templates/unavailable-zha.yaml.j2
@@ -11,8 +11,9 @@
       subtype: device_offline
 {% endfor %}
   action:
-    - service: notify.mobile_app_iphone
+    - service: notify.home_assistant
       data:
-        title: "Device unavailable"
         message: >
+          Device unavailable
           {% raw %}{{ device_attr(trigger.event.data.device_id, 'name_by_user') }}{% endraw %} is unavailable
+        target: [ "1070507369164984372" ]
diff --git a/templates/unavailable-zwave.yaml.j2 b/templates/unavailable-zwave.yaml.j2
index 84e2ca8..c993d76 100644
--- a/templates/unavailable-zwave.yaml.j2
+++ b/templates/unavailable-zwave.yaml.j2
@@ -9,8 +9,9 @@
         - {{ device.entity_id }} # {{ device.name }}
 {% endfor %}
   action:
-    - service: notify.mobile_app_iphone
+    - service: notify.home_assistant
       data:
-        title: "Device unavailable"
         message: >
+          Device unavailable
           {% raw %}{{ device_attr(device_id(trigger.event.data.device_id), 'name_by_user') }}{% endraw %} is unavailable
+        target: [ "1070507369164984372" ]