diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index ace9f13..83a6cde 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -3307,7 +3307,7 @@ trigger:
   - platform: event
     event_type: state_changed
     event_data:
-      entity_id: !input "home_value01"
+      entity_id: !input "home_value03"
     id: home_value03_state
 
   ##### Climate - Trigger "climate_state" #####
@@ -5172,7 +5172,7 @@ action:
           - service: "{{ command_text_printf }}"
             data:
               component: home.value01_state
-              message: '{{ trigger.event.data.new_state.state |round(1) }}'
+              message: '{{ trigger.event.data.new_state.state |round(1) }}{{ trigger.event.data.new_state.attributes.unit_of_measurement }}'
 
       ##### Home Value 02 #####
       - conditions:
@@ -5184,7 +5184,7 @@ action:
           - service: "{{ command_text_printf }}"
             data:
               component: home.value02_state
-              message: '{{ trigger.event.data.new_state.state |round(1) }}'
+              message: '{{ trigger.event.data.new_state.state |round(1) }}{{ trigger.event.data.new_state.attributes.unit_of_measurement }}'
 
       ##### Home Value 03 #####
       - conditions:
@@ -5196,7 +5196,7 @@ action:
           - service: "{{ command_text_printf }}"
             data:
               component: home.value03_state
-              message: '{{ trigger.event.data.new_state.state |round(1) }}'
+              message: '{{ trigger.event.data.new_state.state |round(1) }}{{ trigger.event.data.new_state.attributes.unit_of_measurement }}'
 
       ##### Hotwater Temp #####
       - conditions:
@@ -5231,13 +5231,13 @@ action:
           - service: "{{ command_text_printf }}"
             data:
               component: home.outdoor_temp
-              message: "{{ trigger.event.data.new_state.state |round(0) }}°"
+              message: "{{ trigger.event.data.new_state.state |round(1) }}°"
           - delay:
               milliseconds: "{{ delay_value }}"
           - service: "{{ command_text_printf }}"
             data:
               component: climate.outdoor_temp
-              message: "{{ trigger.event.data.new_state.state |round(0) }}°"
+              message: "{{ trigger.event.data.new_state.state |round(1) }}°"
 
       ##### Indoor Temp Entity #####
       - conditions: