diff --git a/automations.yaml b/automations.yaml
index 6b2f496..90ac22e 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -467,8 +467,7 @@
       type: alert
       who: all
       message: clear_notification
-      data:
-        tag: tornado-warning
+      tag: tornado-warning
     alias: Clear critical notification
   - service: input_boolean.turn_off
     data: {}
diff --git a/packages/presence.yaml b/packages/presence.yaml
index b29a4a4..6a7275c 100644
--- a/packages/presence.yaml
+++ b/packages/presence.yaml
@@ -493,8 +493,7 @@ script:
         type: alert
         who: all
         message: "clear_notification"
-        data:
-          tag: skip-away
+        tag: skip-away
     - if:
       - condition: template
         value_template: "{{ is_state('input_boolean.away_mode_skipped','on') or is_state('group.adults','home') }}"
diff --git a/packages/security.yaml b/packages/security.yaml
index d157241..bf0ef63 100644
--- a/packages/security.yaml
+++ b/packages/security.yaml
@@ -323,8 +323,7 @@ automation:
             type: alert
             who: all
             message: clear_notification
-            data:
-              tag: lockdown-issue
+            tag: lockdown-issue
         - service: persistent_notification.dismiss
           data:
             notification_id: lockdown_issue
diff --git a/packages/weatheralerts.yaml b/packages/weatheralerts.yaml
index 9189474..96d5fbb 100644
--- a/packages/weatheralerts.yaml
+++ b/packages/weatheralerts.yaml
@@ -1565,8 +1565,7 @@ automation:
               type: alert
               who: all
               message: clear_notification
-              data:
-                tag: rain-window-warning
+              tag: rain-window-warning
           - service: script.speech_engine
             data:
               who: common
@@ -1580,8 +1579,7 @@ automation:
               type: alert
               who: all
               message: clear_notification
-              data:
-                tag: rain-window-warning
+              tag: rain-window-warning
           - service: script.speech_engine
             data:
               who: common
@@ -1667,8 +1665,7 @@ script:
           type: alert
           who: all
           message: clear_notification
-          data:
-            tag: lightning-warning
+          tag: lightning-warning
       - service: script.status_annc
         data:
           who: 'common'