diff --git a/blueprints/automation/wd-close-weather-notification.yaml b/blueprints/automation/wd-close-weather-notification.yaml
index 3b59b0f..6520980 100644
--- a/blueprints/automation/wd-close-weather-notification.yaml
+++ b/blueprints/automation/wd-close-weather-notification.yaml
@@ -55,7 +55,8 @@ blueprint:
     notify_target:
       name: Notification Target
       selector:
-        target: {}
+        entity:
+          domain: notify
     custom_message:
       name: Custom Notification Message
       default: "{{ entity_name }} is open! Trigger: {{ trigger_state }}"
@@ -79,34 +80,26 @@ condition:
     state: 'on'
 
 action:
-  - variables:
-      open_entities: >
-        {% set openings = states.binary_sensor | selectattr('entity_id', 'in', !input openings) | selectattr('state', 'eq', 'on') | map(attribute='attributes.friendly_name') | list %}
-        {% if openings | length > 0 %}
-          {{ openings }}
-        {% else %}
-          []
-        {% endif %}
-  - if: "{{ open_entities | length > 0 }}"
-    then:
-      - service: notify.notify
-        data:
-          target: !input notify_target
-          message: >
-            {% set trigger_state = 'Unknown' %}
-            {% if trigger.platform == 'numeric_state' %}
-              {% if trigger.above is defined %}
-                {% set trigger_state = 'Temperature > ' + trigger.above | string %}
-              {% elif trigger.below is defined %}
-                {% set trigger_state = 'Temperature < ' + trigger.below | string %}
-              {% endif %}
-            {% elif trigger.platform == 'state' %}
-              {% set trigger_state = trigger.to_state.state %}
+  - service: "[[[ return !input.notify_target ]]]"
+    data:
+      message: >
+        {% set open_entities = states.binary_sensor | selectattr('entity_id', 'in', !input.openings) | selectattr('state', 'eq', 'on') | map(attribute='attributes.friendly_name') | list %}
+        {% if open_entities | length > 0 %}
+          {% set trigger_state = 'Unknown' %}
+          {% if trigger.platform == 'numeric_state' %}
+            {% if trigger.above is defined %}
+              {% set trigger_state = 'Temperature > ' + trigger.above | string %}
+            {% elif trigger.below is defined %}
+              {% set trigger_state = 'Temperature < ' + trigger.below | string %}
             {% endif %}
+          {% elif trigger.platform == 'state' %}
+            {% set trigger_state = trigger.to_state.state %}
+          {% endif %}
 
-            {% set msg = !input custom_message | replace('{{ trigger_state }}', trigger_state) %}
-            {% set message_parts = [] %}
-            {% for entity_name in open_entities %}
-              {% set message_parts = message_parts + [msg | replace('{{ entity_name }}', entity_name)] %}
-            {% endfor %}
-            {{ message_parts | join("\n") }}
\ No newline at end of file
+          {% set msg = !input custom_message | replace('{{ trigger_state }}', trigger_state) %}
+          {% set message_parts = [] %}
+          {% for entity_name in open_entities %}
+            {% set message_parts = message_parts + [msg | replace('{{ entity_name }}', entity_name)] %}
+          {% endfor %}
+          {{ message_parts | join("\n") }}
+        {% endif %}
\ No newline at end of file