diff --git a/plugin/teksi_wastewater/interlis/config.py b/plugin/teksi_wastewater/interlis/config.py
index 9a24f1924..2b371d307 100644
--- a/plugin/teksi_wastewater/interlis/config.py
+++ b/plugin/teksi_wastewater/interlis/config.py
@@ -16,12 +16,17 @@
 TWW_VL_SCHEMA = "tww_vl"
 TWW_SYS_SCHEMA = "tww_sys"
 ABWASSER_SCHEMA = "pg2ili_abwasser"
+TWW_AG_SCHEMA = "tww_ag6496"
 MODEL_NAME_VSA_KEK = "VSA_KEK_2020_1_LV95"
 MODEL_NAME_SIA405_ABWASSER = "SIA405_ABWASSER_2020_1_LV95"
 MODEL_NAME_SIA405_BASE_ABWASSER = "SIA405_Base_Abwasser_1_LV95"
 MODEL_NAME_DSS = "DSS_2020_1_LV95"
+MODEL_NAME_AG96 = "Genereller_Entwaesserungsplan_AG"
+MODEL_NAME_AG64 = "Abwasserkataster_AG_V2_LV95"
 
 TOPIC_NAME_SIA405_ADMINISTRATION = "SIA405_Base_Abwasser_1_LV95.Administration"
 TOPIC_NAME_SIA405_ABWASSER = "SIA405_ABWASSER_2020_1_LV95.SIA405_Abwasser"
 TOPIC_NAME_DSS = "DSS_2020_1_LV95.Siedlungsentwaesserung"
 TOPIC_NAME_KEK = "VSA_KEK_2020_1_LV95.KEK"
+TOPIC_NAME_AG96 = "Genereller_Entwaesserungsplan_AG.AG96"
+TOPIC_NAME_AG64 = "Abwasserkataster_AG_V2_LV95.AG64"
diff --git a/plugin/teksi_wastewater/interlis/interlis_model_mapping/interlis_exporter_to_intermediate_schema.py b/plugin/teksi_wastewater/interlis/interlis_model_mapping/interlis_exporter_to_intermediate_schema.py
index 96c7ed18b..1e9911516 100644
--- a/plugin/teksi_wastewater/interlis/interlis_model_mapping/interlis_exporter_to_intermediate_schema.py
+++ b/plugin/teksi_wastewater/interlis/interlis_model_mapping/interlis_exporter_to_intermediate_schema.py
@@ -3082,8 +3082,10 @@ def _export_label_positions(self):
             tid_for_obj_id["vw_tww_reach"][row.t_ili_tid] = row.t_id
         for row in self.abwasser_session.query(self.model_classes_interlis.abwasserbauwerk):
             tid_for_obj_id["vw_tww_wastewater_structure"][row.t_ili_tid] = row.t_id
-        for row in self.abwasser_session.query(self.model_classes_interlis.einzugsgebiet):
-            tid_for_obj_id["catchment_area"][row.t_ili_tid] = row.t_id
+
+        if self.model in [config.MODEL_NAME_DSS, config.MODEL_NAME_AG96]:
+            for row in self.abwasser_session.query(self.model_classes_interlis.einzugsgebiet):
+                tid_for_obj_id["catchment_area"][row.t_ili_tid] = row.t_id
 
         with open(self.labels_file) as labels_file_handle:
             labels = json.load(labels_file_handle)