diff --git a/templates/low-battery.yaml.j2 b/templates/low-battery.yaml.j2
index d77eb4f..c5a6af5 100644
--- a/templates/low-battery.yaml.j2
+++ b/templates/low-battery.yaml.j2
@@ -3,13 +3,21 @@
   mode: single
   trigger:
     - platform: numeric_state
-      below: 20
+      below: 15
+      for:
+        hours: 0
+        minutes: 1
+        seconds: 0
       entity_id:
 {% for entity in entities %}
         - {{ entity }}
 {% endfor %}
     - platform: numeric_state
       below: 10
+      for:
+        hours: 0
+        minutes: 1
+        seconds: 0
       entity_id:
 {% for entity in entities %}
         - {{ entity }}
@@ -19,4 +27,4 @@
       data:
         title: "Low battery"
         message: >
-          {% raw %}{{ state_attr(trigger.entity_id, 'name_by_user') }} has low battery {{ states(trigger.entity_id) }}% {% endraw %}
+          {% raw %}{{ device_attr(trigger.entity_id, 'name_by_user') }} has low battery {{ states(trigger.entity_id) }}% {% endraw %}