diff --git a/datatypes/epc/domain/mapper.py b/datatypes/epc/domain/mapper.py
index 8b3603b0..df48336f 100644
--- a/datatypes/epc/domain/mapper.py
+++ b/datatypes/epc/domain/mapper.py
@@ -155,6 +155,16 @@ class EpcPropertyDataMapper:
                 is_dwelling_export_capable=general.dwelling_export_capable,
                 wind_turbines_terrain_type=general.terrain_type,
                 electricity_smart_meter_present=general.electricity_smart_meter,
+                pv_connection=renewables.pv_connection,
+                photovoltaic_supply=(
+                    PhotovoltaicSupply(
+                        none_or_no_details=PhotovoltaicSupplyNoneOrNoDetails(
+                            percent_roof_area=renewables.percent_roof_covered_pv,
+                        )
+                    )
+                    if renewables.percent_roof_covered_pv is not None
+                    else None
+                ),
             ),
             sap_building_parts=sap_building_parts,
             solar_water_heating=renewables.solar_hot_water,