diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 0b503f8..5ca7788 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -309,7 +309,9 @@ Discover what's next and what we are working on right now in our [Milestones](ht
 - @bluefoxlee - For the CJK fonts and all the support with #1359
 - @Floppe - Fix entity pages labels, #1455
 - @tikismoke - Customization guide: Exposing relay fallback switch to Home Assistant, #1537
-- @andythomas - Allow to set upper and lower set points for embedded thermostat, #1573
+- @andythomas:
+    - Allow to set upper and lower set points for embedded thermostat, #1573
+    - Bugfix for embedded climate/cool functionality, #1587
 - And to all users who helped with the tests during development and beta.
 
 ## Previous releases
diff --git a/nspanel_esphome_addon_climate_cool.yaml b/nspanel_esphome_addon_climate_cool.yaml
index a0c5471..2fdc006 100644
--- a/nspanel_esphome_addon_climate_cool.yaml
+++ b/nspanel_esphome_addon_climate_cool.yaml
@@ -19,8 +19,8 @@ climate:
   - id: !extend thermostat_embedded
     min_cooling_off_time: ${min_off_time}s
     min_cooling_run_time: ${min_run_time}s
-    cool_deadband: ${heat_deadband} ${temp_units}
-    cool_overrun: ${heat_overrun} ${temp_units}
+    cool_deadband: ${cool_deadband} ${temp_units}
+    cool_overrun: ${cool_overrun} ${temp_units}
     cool_action:
       - switch.turn_on: relay_${cooler_relay}
     preset:
diff --git a/nspanel_esphome_addon_climate_dual.yaml b/nspanel_esphome_addon_climate_dual.yaml
index 3aab707..01750ba 100644
--- a/nspanel_esphome_addon_climate_dual.yaml
+++ b/nspanel_esphome_addon_climate_dual.yaml
@@ -18,8 +18,8 @@ climate:
     min_heating_off_time: ${min_off_time}s
     min_cooling_run_time: ${min_run_time}s
     min_heating_run_time: ${min_run_time}s
-    cool_deadband: ${heat_deadband} ${temp_units}
-    cool_overrun: ${heat_overrun} ${temp_units}
+    cool_deadband: ${cool_deadband} ${temp_units}
+    cool_overrun: ${cool_overrun} ${temp_units}
     heat_deadband: ${heat_deadband} ${temp_units}
     heat_overrun: ${heat_overrun} ${temp_units}
     cool_action: