diff --git a/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py b/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py
index 79a5d745..1e790d88 100644
--- a/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py
+++ b/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py
@@ -7,6 +7,7 @@ Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concord
 """
 
 import xmltodict
+from pathlib import Path
 from hub.catalog_factories.catalog import Catalog
 from hub.catalog_factories.data_models.energy_systems.system import System
 from hub.catalog_factories.data_models.energy_systems.content import Content
@@ -251,6 +252,7 @@ class NorthAmericaEnergySystemCatalog(Catalog):
     return storage_components
 
   def _load_systems(self):
+    base_path = Path(Path(__file__).parent.parent.parent / 'data/energy_systems')
     _catalog_systems = []
     systems = self._archetypes['EnergySystemCatalog']['systems']['system']
     for system in systems:
@@ -259,12 +261,13 @@ class NorthAmericaEnergySystemCatalog(Catalog):
       demands = system['demands']['demand']
       generation_components = system['components']['generation_id']
       generation_systems = self._search_generation_equipment(self._load_generation_components(), generation_components)
+      configuration_schema = Path(base_path / system['schema'])
       energy_system = System(system_id=system_id,
                              name=name,
                              demand_types=demands,
                              generation_systems=generation_systems,
                              distribution_systems=None,
-                             configuration_schema=None)
+                             configuration_schema=configuration_schema)
       _catalog_systems.append(energy_system)
     return _catalog_systems
 
diff --git a/hub/data/energy_systems/north_america_systems.xml b/hub/data/energy_systems/north_america_systems.xml
index 2a7c89c8..ce575841 100644
--- a/hub/data/energy_systems/north_america_systems.xml
+++ b/hub/data/energy_systems/north_america_systems.xml
@@ -109,6 +109,7 @@
   <systems>
 	<system id="1">
 		<name>Air Source Heat Pump with Natural Gas Boiler and thermal storage</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
 		<demands>
 			<demand>heating</demand>
 			<demand>domestic_hot_water</demand>
@@ -120,6 +121,7 @@
 	</system>
 	<system id="2">
 		<name>Air Source Heat Pump with Electrical Boiler and thermal storage</name>
+		<schema>schemas/ASHP+TES+ElectricBoiler.jpg</schema>
 		<demands>
 			<demand>heating</demand>
 			<demand>domestic_hot_water</demand>
@@ -131,6 +133,7 @@
 	</system>
 	<system id="3">
 		<name>Ground Source Heat Pump with Natural Gas Boiler and thermal storage</name>
+		<schema>schemas/GSHP+TES+GasBoiler.jpg</schema>
 		<demands>
 			<demand>heating</demand>
 			<demand>domestic_hot_water</demand>
@@ -142,6 +145,7 @@
 	</system>
 	<system id="4">
 		<name>Ground Source Heat Pump with Electrical Boiler and thermal storage</name>
+		<schema>schemas/GSHP+TES+ElectricBoiler.jpg</schema>
 		<demands>
 			<demand>heating</demand>
 			<demand>domestic_hot_water</demand>
@@ -153,6 +157,7 @@
 	</system>
 	<system id="5">
 		<name>Water Source Heat Pump with Natural Gas Boiler and thermal storage</name>
+		<schema>schemas/WSHP+TES+GasBoiler.jpg</schema>
 		<demands>
 			<demand>heating</demand>
 			<demand>domestic_hot_water</demand>
@@ -163,7 +168,8 @@
 		</components>
 	</system>
 	<system id="6">
-		<name>Water Source Heat Pump with Electrical Boiler and thermal storage</name>\
+		<name>Water Source Heat Pump with Electrical Boiler and thermal storage</name>
+		<schema>schemas/WSHP+TES+ElectricBoiler.jpg</schema>
 		<demands>
 			<demand>heating</demand>
 			<demand>domestic_hot_water</demand>
@@ -175,6 +181,7 @@
 	</system>
 	<system id="7">
 		<name>Photovoltaic System</name>
+		<schema>schemas/PV.jpg</schema>
 		<demands>
 			<demand>electricity</demand>
 		</demands>
diff --git a/hub/data/energy_systems/schemas/ASHP+TES+ElectricBoiler.jpg b/hub/data/energy_systems/schemas/ASHP+TES+ElectricBoiler.jpg
new file mode 100644
index 00000000..12ee33be
Binary files /dev/null and b/hub/data/energy_systems/schemas/ASHP+TES+ElectricBoiler.jpg differ
diff --git a/hub/data/energy_systems/schemas/ASHP+TES+GasBoiler.jpg b/hub/data/energy_systems/schemas/ASHP+TES+GasBoiler.jpg
new file mode 100644
index 00000000..12ee33be
Binary files /dev/null and b/hub/data/energy_systems/schemas/ASHP+TES+GasBoiler.jpg differ
diff --git a/hub/data/energy_systems/schemas/GSHP+TES+ElectricBoiler.jpg b/hub/data/energy_systems/schemas/GSHP+TES+ElectricBoiler.jpg
new file mode 100644
index 00000000..12ee33be
Binary files /dev/null and b/hub/data/energy_systems/schemas/GSHP+TES+ElectricBoiler.jpg differ
diff --git a/hub/data/energy_systems/schemas/GSHP+TES+GasBoiler.jpg b/hub/data/energy_systems/schemas/GSHP+TES+GasBoiler.jpg
new file mode 100644
index 00000000..12ee33be
Binary files /dev/null and b/hub/data/energy_systems/schemas/GSHP+TES+GasBoiler.jpg differ
diff --git a/hub/data/energy_systems/schemas/PV.jpg b/hub/data/energy_systems/schemas/PV.jpg
new file mode 100644
index 00000000..12ee33be
Binary files /dev/null and b/hub/data/energy_systems/schemas/PV.jpg differ
diff --git a/hub/data/energy_systems/schemas/WSHP+TES+ElectricBoiler.jpg b/hub/data/energy_systems/schemas/WSHP+TES+ElectricBoiler.jpg
new file mode 100644
index 00000000..12ee33be
Binary files /dev/null and b/hub/data/energy_systems/schemas/WSHP+TES+ElectricBoiler.jpg differ
diff --git a/hub/data/energy_systems/schemas/WSHP+TES+GasBoiler.jpg b/hub/data/energy_systems/schemas/WSHP+TES+GasBoiler.jpg
new file mode 100644
index 00000000..12ee33be
Binary files /dev/null and b/hub/data/energy_systems/schemas/WSHP+TES+GasBoiler.jpg differ