diff --git a/packages/announcements.yaml b/packages/announcements.yaml
index eebcdd2..935b463 100644
--- a/packages/announcements.yaml
+++ b/packages/announcements.yaml
@@ -274,7 +274,7 @@ script:
     sequence:
     - service: script.speech_engine
       data:
-        who: "{{ who if who is defined else 'common' }}"
+        who: "{{ who|default('common') }}"
         message: !include ../templates/speech/daily_briefing.yaml
     - service: input_boolean.turn_on
       target:
@@ -285,7 +285,7 @@ script:
     sequence:
       - service: script.speech_engine
         data:
-          who: "{{ who if who is defined else 'common' }}"
+          who: "{{ who|default('common') }}"
           message: !include ../templates/speech/nightly_briefing.yaml
       - service: input_boolean.turn_on
         target:
@@ -296,7 +296,7 @@ script:
     sequence:
     - service: script.speech_engine
       data:
-        who: "{{ who if who is defined else 'common' }}"
+        who: "{{ who|default('common') }}"
         message: !include ../templates/speech/morning_briefing.yaml
     - service: input_boolean.turn_on
       target:
@@ -307,7 +307,7 @@ script:
     sequence:
     - service: script.status_annc
       data:
-        who: "{{ who if who is defined else 'everywhere' }}"
+        who: "{{ who|default('everywhere') }}"
         call_dinner_is_ready: 1
 
   we_are_leaving:
@@ -315,7 +315,7 @@ script:
     sequence:
     - service: script.status_annc
       data:
-        who: "{{ who if who is defined else 'everywhere' }}"
+        who: "{{ who|default('everywhere') }}"
         call_we_are_leaving: 1
 
   server_maintenance_annc:
@@ -323,7 +323,7 @@ script:
     sequence:
     - service: script.status_annc
       data:
-        who: "{{ who if who is defined else 'everywhere' }}"
+        who: "{{ who|default('everywhere') }}"
         call_interruption: 1
         call_server_maintenance: 1
 
@@ -411,7 +411,7 @@ script:
       - alias: "Read the announcement"
         service: script.speech_engine
         data:
-          who: "{{ who if who is defined else 'everywhere' }}"
+          who: "{{ who|default('everywhere') }}"
           message: !include ../templates/speech/birthdays.yaml
       - alias: "Give time for the announcement to complete"
         delay:
diff --git a/packages/notify.yaml b/packages/notify.yaml
index d24a957..37c6e37 100644
--- a/packages/notify.yaml
+++ b/packages/notify.yaml
@@ -906,12 +906,12 @@ script:
               title: "{{ title }}"
               message: "{{ message }}"
               data:
-                tag: '{{ tag if tag is defined else "{}" }}'
-                actions: '{{ actions if actions is defined else "{}" }}'
-                entity_id: '{{ entity if entity is defined else "{}" }}'
+                tag: '{{ tag|default("{}") }}'
+                actions: '{{ actions|default("{}") }}'
+                entity_id: '{{ entity|default("{}") }}'
                 push:
                   sound:
-                    name: '{{ sound if sound is defined else "default" }}'
+                    name: '{{ sound|default("default") }}'
                     critical: 1
         - conditions:
           - condition: template
@@ -935,12 +935,12 @@ script:
               title: '{{ title }}'
               message: '{{ message }}'
               data:
-                tag: '{{ tag if tag is defined else "{}" }}'
-                actions: '{{ actions if actions is defined else "{}" }}'
-                entity_id: '{{ entity if entity is defined else "{}" }}'
+                tag: '{{ tag|default("{}") }}'
+                actions: '{{ actions|default("{}") }}'
+                entity_id: '{{ entity|default("{}") }}'
                 push:
                   sound:
-                    name: '{{ sound if sound is defined else "default" }}'
+                    name: '{{ sound|default("default") }}'
         default:
         - condition: state
           entity_id: input_boolean.text_notifications
@@ -992,12 +992,12 @@ script:
               title: '{{ title }}'
               message: '{{ message }}'
               data:
-                tag: '{{ tag if tag is defined else "{}" }}'
-                actions: '{{ actions if actions is defined else "{}" }}'
-                entity_id: '{{ entity if entity is defined else "{}" }}'
+                tag: '{{ tag|default("{}") }}'
+                actions: '{{ actions|default("{}") }}'
+                entity_id: '{{ entity|default("{}") }}'
                 push:
                   sound:
-                    name: '{{ sound if sound is defined else "default" }}'
+                    name: '{{ sound|default("default") }}'
 
   tv_notify:
     alias: 'TV Notify'
@@ -1053,7 +1053,7 @@ script:
         data:
           title: '{{ title }}'
           message: '{{ message }}'
-          data: '{{ data if data is defined else "{}" }}'
+          data: '{{ data|default("{}") }}'
 
   text_alert_image:
     alias: 'Text Alert Image'