diff --git a/hub/data/energy_systems/montreal_custom_systems.xml b/hub/data/energy_systems/montreal_custom_systems.xml
index d3a7591d..dff8f8bf 100644
--- a/hub/data/energy_systems/montreal_custom_systems.xml
+++ b/hub/data/energy_systems/montreal_custom_systems.xml
@@ -33,7 +33,6 @@
         <equipment id="7" type="heat pump" fuel_type="electricity">
             <name>Heat Pump</name>
             <heating_efficiency>2.79</heating_efficiency>
-            <cooling_efficiency>3.23</cooling_efficiency>
             <storage>false</storage>
         </equipment>
     </generation_equipments>
@@ -306,8 +305,8 @@
                 <demand>cooling</demand>
             </demands>
             <equipments>
-                <generation_id>7</generation_id>
-                <distribution_id>4</distribution_id>
+                <generation_id>5</generation_id>
+                <distribution_id>2</distribution_id>
                 <dissipation_id>2</dissipation_id>
             </equipments>
         </system>
diff --git a/hub/helpers/data/montreal_system_to_hub_energy_generation_system.py b/hub/helpers/data/montreal_system_to_hub_energy_generation_system.py
index 224431a9..054b5aca 100644
--- a/hub/helpers/data/montreal_system_to_hub_energy_generation_system.py
+++ b/hub/helpers/data/montreal_system_to_hub_energy_generation_system.py
@@ -29,7 +29,9 @@ class MontrealSystemToHubEnergyGenerationSystem:
       'Single zone packaged rooftop unit with air cooled DX': cte.CHILLER,
       'Single zone make-up air unit with air cooled DX': cte.CHILLER,
       'Multi-zone built-up system with water cooled, water chiller': cte.CHILLER,
-      'PV system': cte.PHOTOVOLTAIC
+      'PV system': cte.PHOTOVOLTAIC,
+      'Multi-zone built-up system with heat pump for heat': cte.HEAT_PUMP,
+      'Multi-zone built-up system with heat pump for cooling': cte.HEAT_PUMP
                         }
 
   @property