diff --git a/blueprints/automation/wd-close-weather-notification.yaml b/blueprints/automation/wd-close-weather-notification.yaml
index cb80e1d..9f6f6bd 100644
--- a/blueprints/automation/wd-close-weather-notification.yaml
+++ b/blueprints/automation/wd-close-weather-notification.yaml
@@ -13,25 +13,24 @@ blueprint:
     weather_sensor:
       name: Weather Sensor
       description: Optional weather entity to trigger notification
+      default: []
       selector:
         entity:
           domain: weather
-    weather_trigger_states:
-      name: Weather Trigger States
-      default:
-        - storm
-        - rain
+          multiple: false
+    weather_trigger_state:
+      name: Weather Trigger State
+      description: Notify when weather entity is in this state (e.g. "rain")
+      default: rain
       selector:
-        text:
-          multiline: true
+        text: {}
     temperature_sensor:
       name: Temperature Sensor
       description: Optional temperature entity to trigger notification
+      default: []
       selector:
         entity:
-          domain:
-            - sensor
-            - weather
+          domain: sensor
           device_class: temperature
     temp_above:
       name: Notify if Temperature Above
@@ -52,6 +51,7 @@ blueprint:
     notify_service:
       name: Notification Service
       description: Enter the notify service (e.g. notify.mobile_app_myphone, notify.alexa_media_livingroom, notify.telegram)
+      default: notify.notify
       selector:
         text: {}
     custom_message:
@@ -68,7 +68,7 @@ blueprint:
 trigger:
   - platform: state
     entity_id: !input weather_sensor
-    to: "{{ !input weather_trigger_states.split(',') | map('trim') | list }}"
+    to: !input weather_trigger_state
   - platform: numeric_state
     entity_id: !input temperature_sensor
     above: !input temp_above