diff --git a/examples/air-purifier-app/air-purifier-common/BUILD.gn b/examples/air-purifier-app/air-purifier-common/BUILD.gn
index 9715f88e65f2b3..aaf01bf29b7ba0 100755
--- a/examples/air-purifier-app/air-purifier-common/BUILD.gn
+++ b/examples/air-purifier-app/air-purifier-common/BUILD.gn
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("air-purifier-common") {
   zap_file = "air-purifier-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/air-purifier-app/zap-generated"
   is_server = true
 }
diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/BUILD.gn b/examples/air-quality-sensor-app/air-quality-sensor-common/BUILD.gn
index 6ca5be5ba634db..5cdba00ee78fc0 100755
--- a/examples/air-quality-sensor-app/air-quality-sensor-common/BUILD.gn
+++ b/examples/air-quality-sensor-app/air-quality-sensor-common/BUILD.gn
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("air-quality-sensor-common") {
   zap_file = "air-quality-sensor-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/air-quality-sensor-app/zap-generated"
   is_server = true
 }
diff --git a/examples/all-clusters-app/all-clusters-common/BUILD.gn b/examples/all-clusters-app/all-clusters-common/BUILD.gn
index 0210fcedb2c646..1b29a9c2775353 100644
--- a/examples/all-clusters-app/all-clusters-common/BUILD.gn
+++ b/examples/all-clusters-app/all-clusters-common/BUILD.gn
@@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("all-clusters-common") {
   zap_file = "all-clusters-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/all-clusters-app/zap-generated"
   is_server = true
 }
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/BUILD.gn b/examples/all-clusters-minimal-app/all-clusters-common/BUILD.gn
index 9991df1e8274ea..cd518cb42fe388 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/BUILD.gn
+++ b/examples/all-clusters-minimal-app/all-clusters-common/BUILD.gn
@@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("all-clusters-common") {
   zap_file = "all-clusters-minimal-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/all-clusters-minimal-app/zap-generated"
   is_server = true
 }
diff --git a/examples/bridge-app/bridge-common/BUILD.gn b/examples/bridge-app/bridge-common/BUILD.gn
index ac3aa414ae3791..e833d33429567e 100644
--- a/examples/bridge-app/bridge-common/BUILD.gn
+++ b/examples/bridge-app/bridge-common/BUILD.gn
@@ -19,7 +19,6 @@ import("${chip_root}/src/app/chip_data_model.gni")
 chip_data_model("bridge-common") {
   zap_file = "bridge-app.zap"
 
-  zap_pregenerated_dir = "${chip_root}/zzz_generated/bridge-app/zap-generated"
   is_server = true
 
   # TODO: the definition of DYNAMIC_ENDPOINT_COUNT needs find a common home!
diff --git a/examples/chef/linux/BUILD.gn b/examples/chef/linux/BUILD.gn
index a119f832e051db..02fa77dac864e5 100644
--- a/examples/chef/linux/BUILD.gn
+++ b/examples/chef/linux/BUILD.gn
@@ -35,8 +35,6 @@ project_dir = "./.."
 
 chip_data_model("chef-data-model") {
   zap_file = "${project_dir}/devices/${sample_zap_file}"
-  zap_pregenerated_dir =
-      "${chip_root}/examples/chef/out/${sample_name}/zap-generated/"
   is_server = true
 }
 
diff --git a/examples/chef/silabs/BUILD.gn b/examples/chef/silabs/BUILD.gn
index 3f74106f9f54c2..528fe2f2cfc50a 100644
--- a/examples/chef/silabs/BUILD.gn
+++ b/examples/chef/silabs/BUILD.gn
@@ -48,8 +48,6 @@ declare_args() {
 
 chip_data_model("chef-common") {
   zap_file = "${chef_project_dir}/devices/${sample_name}.zap"
-
-  zap_pregenerated_dir = "${chef_project_dir}/out/${sample_name}/zap-generated/"
   is_server = true
 }
 
diff --git a/examples/contact-sensor-app/contact-sensor-common/BUILD.gn b/examples/contact-sensor-app/contact-sensor-common/BUILD.gn
index d95af40a21a3ff..b95b549f746cb6 100755
--- a/examples/contact-sensor-app/contact-sensor-common/BUILD.gn
+++ b/examples/contact-sensor-app/contact-sensor-common/BUILD.gn
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("contact-sensor-common") {
   zap_file = "contact-sensor-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/contact-sensor-app/zap-generated"
   is_server = true
 }
diff --git a/examples/contact-sensor-app/nxp/zap-lit/BUILD.gn b/examples/contact-sensor-app/nxp/zap-lit/BUILD.gn
index 7adfcbb7790a35..3baf5c4f59f105 100644
--- a/examples/contact-sensor-app/nxp/zap-lit/BUILD.gn
+++ b/examples/contact-sensor-app/nxp/zap-lit/BUILD.gn
@@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("zap-lit") {
   zap_file = "contact-sensor-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/contact-sensor-app/nxp/zap-generated"
   is_server = true
 }
diff --git a/examples/contact-sensor-app/nxp/zap-sit/BUILD.gn b/examples/contact-sensor-app/nxp/zap-sit/BUILD.gn
index e9a20db41208d3..55fed097d333c8 100644
--- a/examples/contact-sensor-app/nxp/zap-sit/BUILD.gn
+++ b/examples/contact-sensor-app/nxp/zap-sit/BUILD.gn
@@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("zap-sit") {
   zap_file = "contact-sensor-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/contact-sensor-app/nxp/zap-generated"
   is_server = true
 }
diff --git a/examples/dishwasher-app/dishwasher-common/BUILD.gn b/examples/dishwasher-app/dishwasher-common/BUILD.gn
index 01b634362098cd..73debf8ce3cbe1 100644
--- a/examples/dishwasher-app/dishwasher-common/BUILD.gn
+++ b/examples/dishwasher-app/dishwasher-common/BUILD.gn
@@ -21,8 +21,5 @@ config("config") {
 
 chip_data_model("dishwasher-common") {
   zap_file = "dishwasher-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/dishwasher-app/zap-generated"
   is_server = true
 }
diff --git a/examples/energy-management-app/energy-management-common/BUILD.gn b/examples/energy-management-app/energy-management-common/BUILD.gn
index 7c2040c1a4dc37..937aca9f1746d0 100644
--- a/examples/energy-management-app/energy-management-common/BUILD.gn
+++ b/examples/energy-management-app/energy-management-common/BUILD.gn
@@ -22,8 +22,5 @@ config("config") {
 
 chip_data_model("energy-management-common") {
   zap_file = "energy-management-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/energy-management-app/zap-generated"
   is_server = true
 }
diff --git a/examples/light-switch-app/light-switch-common/BUILD.gn b/examples/light-switch-app/light-switch-common/BUILD.gn
index 163e841678101a..8ec49aac0fa870 100644
--- a/examples/light-switch-app/light-switch-common/BUILD.gn
+++ b/examples/light-switch-app/light-switch-common/BUILD.gn
@@ -17,9 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("light-switch-common") {
   zap_file = "light-switch-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/light-switch-app/zap-generated"
-
   is_server = true
 }
diff --git a/examples/light-switch-app/qpg/zap/BUILD.gn b/examples/light-switch-app/qpg/zap/BUILD.gn
index 35ac7ff5f28346..87282159a25ab3 100644
--- a/examples/light-switch-app/qpg/zap/BUILD.gn
+++ b/examples/light-switch-app/qpg/zap/BUILD.gn
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("zap") {
   zap_file = "switch.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/light-switch-app/qpg/zap-generated"
   is_server = true
 }
diff --git a/examples/lighting-app/bouffalolab/bl602/BUILD.gn b/examples/lighting-app/bouffalolab/bl602/BUILD.gn
index ab89ae3f3bdb63..7a4d4545e5ef28 100644
--- a/examples/lighting-app/bouffalolab/bl602/BUILD.gn
+++ b/examples/lighting-app/bouffalolab/bl602/BUILD.gn
@@ -90,8 +90,6 @@ bl_iot_sdk("sdk") {
 
 chip_data_model("bouffalolab-lighting") {
   zap_file = "${example_dir}/data_model/lighting-app-wifi.zap"
-
-  zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
   is_server = true
 }
 
diff --git a/examples/lighting-app/bouffalolab/bl702/BUILD.gn b/examples/lighting-app/bouffalolab/bl702/BUILD.gn
index f923e3bad6ffe9..05526ff9563e58 100644
--- a/examples/lighting-app/bouffalolab/bl702/BUILD.gn
+++ b/examples/lighting-app/bouffalolab/bl702/BUILD.gn
@@ -122,8 +122,6 @@ chip_data_model("bouffalolab-lighting") {
   } else {
     zap_file = "${example_dir}/data_model/lighting-app-ethernet.zap"
   }
-
-  zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
   is_server = true
 }
 
diff --git a/examples/lighting-app/bouffalolab/bl702l/BUILD.gn b/examples/lighting-app/bouffalolab/bl702l/BUILD.gn
index 24fad9ffa1897d..ea06cfa41ac001 100644
--- a/examples/lighting-app/bouffalolab/bl702l/BUILD.gn
+++ b/examples/lighting-app/bouffalolab/bl702l/BUILD.gn
@@ -99,8 +99,6 @@ bl_iot_sdk("sdk") {
 
 chip_data_model("bouffalolab-lighting") {
   zap_file = "${example_dir}/data_model/lighting-app-thread.zap"
-
-  zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
   is_server = true
 }
 
diff --git a/examples/lighting-app/lighting-common/BUILD.gn b/examples/lighting-app/lighting-common/BUILD.gn
index e983b3e0e0f11c..eb24b69dd214e1 100644
--- a/examples/lighting-app/lighting-common/BUILD.gn
+++ b/examples/lighting-app/lighting-common/BUILD.gn
@@ -21,8 +21,6 @@ config("config") {
 
 chip_data_model("lighting-common") {
   zap_file = "lighting-app.zap"
-
-  zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
   is_server = true
 }
 
diff --git a/examples/lighting-app/nxp/zap/BUILD.gn b/examples/lighting-app/nxp/zap/BUILD.gn
index fd4026e2b9dbf7..4280629a03cc3a 100644
--- a/examples/lighting-app/nxp/zap/BUILD.gn
+++ b/examples/lighting-app/nxp/zap/BUILD.gn
@@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("zap") {
   zap_file = "lighting-on-off.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/lighting-app/nxp/zap-generated"
   is_server = true
 }
diff --git a/examples/lighting-app/qpg/zap/BUILD.gn b/examples/lighting-app/qpg/zap/BUILD.gn
index ec69db0b412a8c..c9de674a2bf8c8 100644
--- a/examples/lighting-app/qpg/zap/BUILD.gn
+++ b/examples/lighting-app/qpg/zap/BUILD.gn
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("zap") {
   zap_file = "light.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/lighting-app/qpg/zap-generated"
   is_server = true
 }
diff --git a/examples/lighting-app/silabs/data_model/BUILD.gn b/examples/lighting-app/silabs/data_model/BUILD.gn
index 9f1ee0d2aee78e..45062169315f03 100644
--- a/examples/lighting-app/silabs/data_model/BUILD.gn
+++ b/examples/lighting-app/silabs/data_model/BUILD.gn
@@ -22,7 +22,5 @@ chip_data_model("silabs-lighting") {
   } else {
     zap_file = "lighting-thread-app.zap"
   }
-
-  zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
   is_server = true
 }
diff --git a/examples/lit-icd-app/lit-icd-common/BUILD.gn b/examples/lit-icd-app/lit-icd-common/BUILD.gn
index a20d519c1cd7fa..28aa29a3981a69 100644
--- a/examples/lit-icd-app/lit-icd-common/BUILD.gn
+++ b/examples/lit-icd-app/lit-icd-common/BUILD.gn
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("lit-icd-common") {
   zap_file = "lit-icd-server-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/lit-icd-server-app/zap-generated"
   is_server = true
 }
diff --git a/examples/lock-app/lock-common/BUILD.gn b/examples/lock-app/lock-common/BUILD.gn
index bb01a5185f80f7..1312ec49bd134f 100644
--- a/examples/lock-app/lock-common/BUILD.gn
+++ b/examples/lock-app/lock-common/BUILD.gn
@@ -17,8 +17,6 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("lock-common") {
   zap_file = "lock-app.zap"
-
-  zap_pregenerated_dir = "${chip_root}/zzz_generated/lock-app/zap-generated"
   is_server = true
 }
 
diff --git a/examples/lock-app/nxp/zap/BUILD.gn b/examples/lock-app/nxp/zap/BUILD.gn
index cc5fe9361c32a3..a21a2d57a57212 100644
--- a/examples/lock-app/nxp/zap/BUILD.gn
+++ b/examples/lock-app/nxp/zap/BUILD.gn
@@ -17,7 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("zap") {
   zap_file = "lock-app.zap"
-
-  zap_pregenerated_dir = "${chip_root}/zzz_generated/lock-app/nxp/zap-generated"
   is_server = true
 }
diff --git a/examples/lock-app/qpg/zap/BUILD.gn b/examples/lock-app/qpg/zap/BUILD.gn
index 67e29db5f3f249..8560b5249ca5c9 100644
--- a/examples/lock-app/qpg/zap/BUILD.gn
+++ b/examples/lock-app/qpg/zap/BUILD.gn
@@ -17,7 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("zap") {
   zap_file = "lock.zap"
-
-  zap_pregenerated_dir = "${chip_root}/zzz_generated/lock-app/qpg/zap-generated"
   is_server = true
 }
diff --git a/examples/log-source-app/log-source-common/BUILD.gn b/examples/log-source-app/log-source-common/BUILD.gn
index 1c434c209fb057..9aa178c078ed82 100644
--- a/examples/log-source-app/log-source-common/BUILD.gn
+++ b/examples/log-source-app/log-source-common/BUILD.gn
@@ -23,9 +23,6 @@ config("config") {
 chip_data_model("log-source-common") {
   zap_file = "log-source-app.zap"
 
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/log-source-app/zap-generated"
-
   deps = [ "${chip_root}/src/protocols/bdx" ]
 
   is_server = true
diff --git a/examples/microwave-oven-app/microwave-oven-common/BUILD.gn b/examples/microwave-oven-app/microwave-oven-common/BUILD.gn
index 121f067a6a7d75..dd91ce23a30eed 100644
--- a/examples/microwave-oven-app/microwave-oven-common/BUILD.gn
+++ b/examples/microwave-oven-app/microwave-oven-common/BUILD.gn
@@ -21,8 +21,5 @@ config("config") {
 
 chip_data_model("microwave-oven-common") {
   zap_file = "microwave-oven-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/microwave-oven-app/zap-generated"
   is_server = true
 }
diff --git a/examples/network-manager-app/network-manager-common/BUILD.gn b/examples/network-manager-app/network-manager-common/BUILD.gn
index eced7ddbbbff7a..e220377a7963cb 100644
--- a/examples/network-manager-app/network-manager-common/BUILD.gn
+++ b/examples/network-manager-app/network-manager-common/BUILD.gn
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("network-manager-common") {
   zap_file = "network-manager-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/network-manager-app/zap-generated"
   is_server = true
 }
diff --git a/examples/ota-provider-app/ota-provider-common/BUILD.gn b/examples/ota-provider-app/ota-provider-common/BUILD.gn
index 63c5f2d1de5083..c13b1e1e73254c 100644
--- a/examples/ota-provider-app/ota-provider-common/BUILD.gn
+++ b/examples/ota-provider-app/ota-provider-common/BUILD.gn
@@ -23,9 +23,6 @@ config("config") {
 chip_data_model("ota-provider-common") {
   zap_file = "ota-provider-app.zap"
 
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/ota-provider-app/zap-generated"
-
   sources = [
     "BdxOtaSender.cpp",
     "BdxOtaSender.h",
diff --git a/examples/ota-requestor-app/ota-requestor-common/BUILD.gn b/examples/ota-requestor-app/ota-requestor-common/BUILD.gn
index edce1324ea7e1f..550d4c09aeb968 100644
--- a/examples/ota-requestor-app/ota-requestor-common/BUILD.gn
+++ b/examples/ota-requestor-app/ota-requestor-common/BUILD.gn
@@ -23,9 +23,6 @@ config("config") {
 chip_data_model("ota-requestor-common") {
   zap_file = "ota-requestor-app.zap"
 
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/ota-requestor-app/zap-generated"
-
   deps = [ "${chip_root}/src/lib" ]
 
   public_configs = [ ":config" ]
diff --git a/examples/placeholder/linux/apps/app1/BUILD.gn b/examples/placeholder/linux/apps/app1/BUILD.gn
index ef7c277ec7f663..f16b9301ce3a90 100644
--- a/examples/placeholder/linux/apps/app1/BUILD.gn
+++ b/examples/placeholder/linux/apps/app1/BUILD.gn
@@ -17,9 +17,6 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("configuration") {
   zap_file = "config.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/placeholder/app1/zap-generated"
   is_server = true
 }
 
diff --git a/examples/placeholder/linux/apps/app2/BUILD.gn b/examples/placeholder/linux/apps/app2/BUILD.gn
index 5c18b7d2dc0914..2bea36611ffb37 100644
--- a/examples/placeholder/linux/apps/app2/BUILD.gn
+++ b/examples/placeholder/linux/apps/app2/BUILD.gn
@@ -17,9 +17,6 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("configuration") {
   zap_file = "config.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/placeholder/app2/zap-generated"
   is_server = true
 }
 
diff --git a/examples/pump-app/pump-common/BUILD.gn b/examples/pump-app/pump-common/BUILD.gn
index 58508f60af8adb..1e7280f5190079 100644
--- a/examples/pump-app/pump-common/BUILD.gn
+++ b/examples/pump-app/pump-common/BUILD.gn
@@ -18,7 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("pump-common") {
   zap_file = "pump-app.zap"
-
-  zap_pregenerated_dir = "${chip_root}/zzz_generated/pump-app/zap-generated"
   is_server = true
 }
diff --git a/examples/pump-app/silabs/data_model/BUILD.gn b/examples/pump-app/silabs/data_model/BUILD.gn
index 35d878aedcb90f..230ba5406364e3 100644
--- a/examples/pump-app/silabs/data_model/BUILD.gn
+++ b/examples/pump-app/silabs/data_model/BUILD.gn
@@ -22,7 +22,5 @@ chip_data_model("silabs-pump") {
   } else {
     zap_file = "pump-thread-app.zap"
   }
-
-  zap_pregenerated_dir = "${chip_root}/zzz_generated/pump-app/zap-generated"
   is_server = true
 }
diff --git a/examples/pump-controller-app/pump-controller-common/BUILD.gn b/examples/pump-controller-app/pump-controller-common/BUILD.gn
index e62de422b08097..82e222e43ff4e1 100644
--- a/examples/pump-controller-app/pump-controller-common/BUILD.gn
+++ b/examples/pump-controller-app/pump-controller-common/BUILD.gn
@@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("pump-controller-common") {
   zap_file = "pump-controller-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/pump-controller-app/zap-generated"
   is_server = true
 }
diff --git a/examples/refrigerator-app/refrigerator-common/BUILD.gn b/examples/refrigerator-app/refrigerator-common/BUILD.gn
index c747755e86c598..4e8e72bb343ff3 100644
--- a/examples/refrigerator-app/refrigerator-common/BUILD.gn
+++ b/examples/refrigerator-app/refrigerator-common/BUILD.gn
@@ -21,8 +21,5 @@ config("config") {
 
 chip_data_model("refrigerator-common") {
   zap_file = "refrigerator-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/refrigerator-app/zap-generated"
   is_server = true
 }
diff --git a/examples/rvc-app/rvc-common/BUILD.gn b/examples/rvc-app/rvc-common/BUILD.gn
index d567043f3ee346..2491f97d9b9809 100644
--- a/examples/rvc-app/rvc-common/BUILD.gn
+++ b/examples/rvc-app/rvc-common/BUILD.gn
@@ -21,7 +21,5 @@ config("config") {
 
 chip_data_model("rvc-common") {
   zap_file = "rvc-app.zap"
-
-  zap_pregenerated_dir = "${chip_root}/zzz_generated/rvc-app/zap-generated"
   is_server = true
 }
diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/BUILD.gn b/examples/smoke-co-alarm-app/smoke-co-alarm-common/BUILD.gn
index 16e5328c1ba01c..6e78dcbf5c4f92 100644
--- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/BUILD.gn
+++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/BUILD.gn
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("smoke-co-alarm-common") {
   zap_file = "smoke-co-alarm-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/smoke-co-alarm-app/zap-generated"
   is_server = true
 }
diff --git a/examples/temperature-measurement-app/temperature-measurement-common/BUILD.gn b/examples/temperature-measurement-app/temperature-measurement-common/BUILD.gn
index 0430c288a90354..1f0f2daea65c76 100644
--- a/examples/temperature-measurement-app/temperature-measurement-common/BUILD.gn
+++ b/examples/temperature-measurement-app/temperature-measurement-common/BUILD.gn
@@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("temperature-measurement-common") {
   zap_file = "temperature-measurement.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/temperature-measurement/zap-generated"
   is_server = true
 }
diff --git a/examples/thermostat/nxp/zap/BUILD.gn b/examples/thermostat/nxp/zap/BUILD.gn
index 976cd78f2e1a79..c3a3df7bd6729e 100644
--- a/examples/thermostat/nxp/zap/BUILD.gn
+++ b/examples/thermostat/nxp/zap/BUILD.gn
@@ -28,7 +28,5 @@ chip_data_model("zap") {
     zap_file = "thermostat_matter_thread.zap"
   }
 
-  # Defining zap_pregenerated_dir is required by chip_data_model.gni in order to build IMClusterCommandHandler.cpp
-  zap_pregenerated_dir = ""
   is_server = true
 }
diff --git a/examples/thermostat/qpg/zap/BUILD.gn b/examples/thermostat/qpg/zap/BUILD.gn
index 38074c904f32eb..3ea8a750459afc 100644
--- a/examples/thermostat/qpg/zap/BUILD.gn
+++ b/examples/thermostat/qpg/zap/BUILD.gn
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("zap") {
   zap_file = "thermostaticRadiatorValve.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/thermostat/qpg/zap-generated"
   is_server = true
 }
diff --git a/examples/thermostat/thermostat-common/BUILD.gn b/examples/thermostat/thermostat-common/BUILD.gn
index 7f35acfdf371ad..93a0c7540fb93a 100644
--- a/examples/thermostat/thermostat-common/BUILD.gn
+++ b/examples/thermostat/thermostat-common/BUILD.gn
@@ -18,7 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("thermostat-common") {
   zap_file = "thermostat.zap"
-
-  zap_pregenerated_dir = "${chip_root}/zzz_generated/thermostat/zap-generated"
   is_server = true
 }
diff --git a/examples/tv-app/tv-common/BUILD.gn b/examples/tv-app/tv-common/BUILD.gn
index 699a13a20ec6e0..c253459d177caa 100644
--- a/examples/tv-app/tv-common/BUILD.gn
+++ b/examples/tv-app/tv-common/BUILD.gn
@@ -19,8 +19,6 @@ import("${chip_root}/src/lib/lib.gni")
 
 chip_data_model("tv-common") {
   zap_file = "tv-app.zap"
-
-  zap_pregenerated_dir = "${chip_root}/zzz_generated/tv-app/zap-generated"
   is_server = true
 }
 
diff --git a/examples/tv-casting-app/tv-casting-common/BUILD.gn b/examples/tv-casting-app/tv-casting-common/BUILD.gn
index 38b983485c1800..ea6607a724b5cb 100644
--- a/examples/tv-casting-app/tv-casting-common/BUILD.gn
+++ b/examples/tv-casting-app/tv-casting-common/BUILD.gn
@@ -34,9 +34,6 @@ config("config") {
 chip_data_model("tv-casting-common") {
   zap_file = "tv-casting-app.zap"
 
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/tv-casting-app/zap-generated"
-
   sources = [
     "${chip_root}/examples/chip-tool/commands/clusters/ModelCommand.h",
     "${chip_root}/examples/chip-tool/commands/common/BDXDiagnosticLogsServerDelegate.cpp",
diff --git a/examples/virtual-device-app/virtual-device-common/BUILD.gn b/examples/virtual-device-app/virtual-device-common/BUILD.gn
index 73be6ac9628be1..82eaf78d8f63e6 100644
--- a/examples/virtual-device-app/virtual-device-common/BUILD.gn
+++ b/examples/virtual-device-app/virtual-device-common/BUILD.gn
@@ -19,8 +19,5 @@ import("${chip_root}/src/lib/lib.gni")
 
 chip_data_model("virtual-device-common") {
   zap_file = "virtual-device-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/virtual-device-app/zap-generated"
   is_server = true
 }
diff --git a/examples/window-app/common/BUILD.gn b/examples/window-app/common/BUILD.gn
index 42941ee10d38d5..62fbc3aa3da4cf 100644
--- a/examples/window-app/common/BUILD.gn
+++ b/examples/window-app/common/BUILD.gn
@@ -18,7 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("window-common") {
   zap_file = "window-app.zap"
-
-  zap_pregenerated_dir = "${chip_root}/zzz_generated/window-app/zap-generated"
   is_server = true
 }
diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni
index 85f5224ada7d37..3763243e404407 100644
--- a/src/app/chip_data_model.gni
+++ b/src/app/chip_data_model.gni
@@ -23,9 +23,6 @@ _app_root = get_path_info(".", "abspath")
 # Defines a source_set for CHIP data model.
 #
 # Arguments:
-#  zap_pregenerated_dir
-#    Path to the ZAP "gen" dir.
-#
 #  zap_file
 #    Path to the ZAP input file.
 #
@@ -54,14 +51,6 @@ template("chip_data_model") {
     _idl = string_replace(invoker.zap_file, ".zap", ".matter")
   }
 
-  config("${_data_model_name}_config") {
-    include_dirs = []
-
-    if (defined(invoker.zap_pregenerated_dir)) {
-      include_dirs += [ "${invoker.zap_pregenerated_dir}/.." ]
-    }
-  }
-
   chip_zapgen("${_data_model_name}_zapgen") {
     input = rebase_path(invoker.zap_file)
     generator = "app-templates"
@@ -82,18 +71,7 @@ template("chip_data_model") {
       prune_outputs = []
     }
 
-    # TODO: It is unclear here why `zap_pregenerated_dir` has any relevance
-    #       in including IMClusterCommandHandler or not.
-    #
-    #       This logic has been carried over from previous code during compile
-    #       time codegen addition, however the rationale of why pregenerated
-    #       dir controls IMClusterCommandHandler needs to be explained and
-    #       potentially controlled by a clearer variable (is this for controllers?
-    #       is this during app compile but not others? I am unclear what
-    #       zap_pregenerated_dir is supposed to convey. Existence of a directory
-    #       does not obviously map to "need command handler cpp compiled in").
-    if (defined(invoker.zap_pregenerated_dir) &&
-        !chip_build_controller_dynamic_server) {
+    if (!chip_build_controller_dynamic_server) {
       outputs += [ "zap-generated/IMClusterCommandHandler.cpp" ]
     } else {
       if (defined(prune_outputs)) {
@@ -101,8 +79,6 @@ template("chip_data_model") {
       }
     }
 
-    public_configs = [ ":${_data_model_name}_config" ]
-
     if (!defined(deps)) {
       deps = []
     }
@@ -120,8 +96,6 @@ template("chip_data_model") {
       "app/cluster-init-callback.cpp",
     ]
 
-    public_configs = [ ":${_data_model_name}_config" ]
-
     if (!defined(deps)) {
       deps = []
     }
@@ -136,7 +110,6 @@ template("chip_data_model") {
     forward_variables_from(invoker,
                            "*",
                            [
-                             "zap_pregenerated_dir",
                              "zap_file",
                              "is_server",
                              "external_clusters",
@@ -390,11 +363,5 @@ template("chip_data_model") {
     if (non_spec_compliant_ota_action_delay_floor >= 0) {
       cflags += [ "-DNON_SPEC_COMPLIANT_OTA_ACTION_DELAY_FLOOR=${non_spec_compliant_ota_action_delay_floor}" ]
     }
-
-    if (!defined(public_configs)) {
-      public_configs = []
-    }
-
-    public_configs += [ ":${_data_model_name}_config" ]
   }
 }
diff --git a/src/controller/data_model/BUILD.gn b/src/controller/data_model/BUILD.gn
index 3b66d026699908..a0b57e7b91fc1e 100644
--- a/src/controller/data_model/BUILD.gn
+++ b/src/controller/data_model/BUILD.gn
@@ -42,9 +42,5 @@ chip_codegen("cluster-tlv-metadata") {
 
 chip_data_model("data_model") {
   zap_file = "controller-clusters.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/controller-clusters/zap-generated"
-
   allow_circular_includes_from = [ "${chip_root}/src/controller" ]
 }