diff --git a/datatypes/epc/domain/mapper.py b/datatypes/epc/domain/mapper.py
index 9458e337e..dccc610b0 100644
--- a/datatypes/epc/domain/mapper.py
+++ b/datatypes/epc/domain/mapper.py
@@ -7943,6 +7943,19 @@ _PASHUB_HEAT_NETWORK_CONTROL_TO_SAP10: Dict[str, int] = {
     "Charging system linked to use of community heating, room thermostat only": (
         2308
     ),
+    # Linked-to-use (DHW 1.00) WITH TRVs — these two DO assert TRVs, so the
+    # with-TRVs type-3 codes are correct here (unlike the thermostat-only
+    # label above, where 2306 was the bug): "programmer and TRVs" → 2306,
+    # "room thermostat and TRVs" → 2314 (PCDB `heat_network_controls`).
+    "Charging system linked to use of community heating, programmer and TRVs": (
+        2306
+    ),
+    "Charging system linked to use of community heating, room thermostat and TRVs": (
+        2314
+    ),
+    # Flat-rate charging (DHW 1.05) with room thermostat + TRVs → 2313
+    # (control type 2, space charging 1.05).
+    "Flat rate charging, room thermostat and TRVs": 2313,
 }