diff --git a/custom_components/peaqhvac/service/hvac/water_heater/models/next_water_boost_model.py b/custom_components/peaqhvac/service/hvac/water_heater/models/next_water_boost_model.py
index fef2d792..bdbce967 100644
--- a/custom_components/peaqhvac/service/hvac/water_heater/models/next_water_boost_model.py
+++ b/custom_components/peaqhvac/service/hvac/water_heater/models/next_water_boost_model.py
@@ -18,23 +18,23 @@
     HvacPresets.Normal: {
         Demand.ErrorDemand:  0,
         Demand.NoDemand:     0,
-        Demand.LowDemand:    26,
-        Demand.MediumDemand: 34,
-        Demand.HighDemand:   46
+        Demand.LowDemand:    20,
+        Demand.MediumDemand: 26,
+        Demand.HighDemand:   32
     },
     HvacPresets.Eco:    {
         Demand.ErrorDemand:  0,
         Demand.NoDemand:     0,
-        Demand.LowDemand:    26,
-        Demand.MediumDemand: 34,
-        Demand.HighDemand:   46
+        Demand.LowDemand:    20,
+        Demand.MediumDemand: 24,
+        Demand.HighDemand:   28
     },
     HvacPresets.Away:   {
         Demand.ErrorDemand:  0,
         Demand.NoDemand:     0,
         Demand.LowDemand:    0,
-        Demand.MediumDemand: 26,
-        Demand.HighDemand:   26
+        Demand.MediumDemand: 20,
+        Demand.HighDemand:   20
     }
 }