diff --git a/scripts/system_simulation_models/archetype1.py b/scripts/system_simulation_models/archetype1.py
index 72d91b70..5c56ec66 100644
--- a/scripts/system_simulation_models/archetype1.py
+++ b/scripts/system_simulation_models/archetype1.py
@@ -16,7 +16,8 @@ class Archetype1:
     self._domestic_hot_water_peak_load = building.domestic_hot_water_peak_load[cte.YEAR][0]
     self._hourly_heating_demand = [0] + [demand / 3600 for demand in building.heating_demand[cte.HOUR]]
     self._hourly_cooling_demand = [demand / 3600 for demand in building.cooling_demand[cte.HOUR]]
-    self._hourly_dhw_demand = building.domestic_hot_water_heat_demand[cte.HOUR]
+    self._hourly_dhw_demand = [demand / cte.WATTS_HOUR_TO_JULES for demand in
+                               building.domestic_hot_water_heat_demand[cte.HOUR]]
     self._output_path = output_path
     self._t_out = [0] + building.external_temperature[cte.HOUR]
     self.results = {}
@@ -27,9 +28,9 @@ class Archetype1:
     heat_pump = self._hvac_system.generation_systems[0]
     boiler = self._hvac_system.generation_systems[1]
     thermal_storage = heat_pump.energy_storage_systems[0]
-    heat_pump.nominal_heat_output = round(0.5 * self._heating_peak_load / 3600)
-    heat_pump.nominal_cooling_output = round(self._cooling_peak_load / 3600)
-    boiler.nominal_heat_output = round(0.5 * self._heating_peak_load / 3600)
+    heat_pump.nominal_heat_output = round(0.5 * self._heating_peak_load)
+    heat_pump.nominal_cooling_output = round(self._cooling_peak_load)
+    boiler.nominal_heat_output = round(0.5 * self._heating_peak_load)
     thermal_storage.volume = round(
       (self._heating_peak_load * storage_factor * cte.WATTS_HOUR_TO_JULES) /
       (cte.WATER_HEAT_CAPACITY * cte.WATER_DENSITY * 25))