diff --git a/scripts/tools/zap_regen_all.py b/scripts/tools/zap_regen_all.py
index 51340239b89244..978f76b3c76d4f 100755
--- a/scripts/tools/zap_regen_all.py
+++ b/scripts/tools/zap_regen_all.py
@@ -52,10 +52,12 @@ def getGlobalTemplatesTargets():
 
         targets.append([str(filepath), '-o', output_dir])
 
-    targets.extend([[str(filepath)]
-                   for filepath in Path('./src/darwin').rglob('*.zap')])
-    targets.extend([[str(filepath)] for filepath in Path(
-        './src/controller/data_model').rglob('*.zap')])
+    targets.extend([
+        [
+            './src/controller/data_model/controller-clusters.zap',
+            '-o',
+            os.path.join('zzz_generated/controller-clusters/zap-generated')]])
+
     return targets
 
 
diff --git a/src/controller/BUILD.gn b/src/controller/BUILD.gn
index 359171a210653f..9abe48de30e61e 100644
--- a/src/controller/BUILD.gn
+++ b/src/controller/BUILD.gn
@@ -14,6 +14,13 @@
 
 import("//build_overrides/chip.gni")
 
+config("config") {
+  # TODO: this should be a dependency on src/controller/data_model however this is circular:
+  #    zzz_generated/controller-clusters depend on src/controller
+  #    src/controller neeeds zzz_generated/controller-cluster for includes
+  include_dirs = [ "${chip_root}/zzz_generated/" ]
+}
+
 static_library("controller") {
   output_name = "libChipController"
 
@@ -48,5 +55,7 @@ static_library("controller") {
     "${chip_root}/src/transport",
   ]
 
+  public_configs = [ ":config" ]
+
   defines = []
 }
diff --git a/src/controller/CHIPDevice.cpp b/src/controller/CHIPDevice.cpp
index c414729574f56d..b3610c2801b5e5 100644
--- a/src/controller/CHIPDevice.cpp
+++ b/src/controller/CHIPDevice.cpp
@@ -26,7 +26,7 @@
 
 #include <controller/CHIPDevice.h>
 
-#include <controller/data_model/zap-generated/CHIPClusters.h>
+#include <controller-clusters/zap-generated/CHIPClusters.h>
 
 #if CONFIG_DEVICE_LAYER
 #include <platform/CHIPDeviceLayer.h>
diff --git a/src/controller/CHIPDevice.h b/src/controller/CHIPDevice.h
index 7fe69dccb4a626..0f24fe6d414e73 100644
--- a/src/controller/CHIPDevice.h
+++ b/src/controller/CHIPDevice.h
@@ -30,7 +30,7 @@
 #include <app/InteractionModelEngine.h>
 #include <app/util/CHIPDeviceCallbacksMgr.h>
 #include <app/util/basic-types.h>
-#include <controller/data_model/zap-generated/CHIPClientCallbacks.h>
+#include <controller-clusters/zap-generated/CHIPClientCallbacks.h>
 #include <core/CHIPCallback.h>
 #include <core/CHIPCore.h>
 #include <credentials/CHIPOperationalCredentials.h>
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
index 3843247f8971c7..5c0c2b50e5c1fe 100644
--- a/src/controller/CHIPDeviceController.cpp
+++ b/src/controller/CHIPDeviceController.cpp
@@ -36,7 +36,7 @@
 #include <controller/CHIPDeviceController.h>
 
 #include <app-common/zap-generated/enums.h>
-#include <controller/data_model/zap-generated/CHIPClusters.h>
+#include <controller-clusters/zap-generated/CHIPClusters.h>
 
 #if CONFIG_DEVICE_LAYER
 #include <platform/CHIPDeviceLayer.h>
diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h
index 32147645c621d6..c9eee9bca1df7e 100644
--- a/src/controller/CHIPDeviceController.h
+++ b/src/controller/CHIPDeviceController.h
@@ -29,10 +29,10 @@
 #pragma once
 
 #include <app/InteractionModelDelegate.h>
+#include <controller-clusters/zap-generated/CHIPClientCallbacks.h>
 #include <controller/AbstractMdnsDiscoveryController.h>
 #include <controller/CHIPDevice.h>
 #include <controller/OperationalCredentialsDelegate.h>
-#include <controller/data_model/zap-generated/CHIPClientCallbacks.h>
 #include <core/CHIPCore.h>
 #include <core/CHIPPersistentStorageDelegate.h>
 #include <core/CHIPTLV.h>
diff --git a/src/controller/data_model/BUILD.gn b/src/controller/data_model/BUILD.gn
index 74e0e4ea00aad7..91ed3315f58846 100644
--- a/src/controller/data_model/BUILD.gn
+++ b/src/controller/data_model/BUILD.gn
@@ -19,7 +19,8 @@ import("${chip_root}/src/app/chip_data_model.gni")
 chip_data_model("data_model") {
   zap_file = "controller-clusters.zap"
 
-  zap_pregenerated_dir = "zap-generated"
+  zap_pregenerated_dir =
+      "${chip_root}/zzz_generated/controller-clusters/zap-generated"
 
   use_default_client_callbacks = true
   allow_circular_includes_from = [ "${chip_root}/src/controller" ]
diff --git a/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj b/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj
index 75923c715eb3c2..d5e596d1957400 100644
--- a/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj
+++ b/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj
@@ -88,11 +88,11 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		1E857305265519720050A4D9 /* CHIPClientCallbacks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CHIPClientCallbacks.cpp; path = "../../../controller/data_model/zap-generated/CHIPClientCallbacks.cpp"; sourceTree = "<group>"; };
-		1E857307265519AE0050A4D9 /* callback-stub.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "callback-stub.cpp"; path = "../../../controller/data_model/zap-generated/callback-stub.cpp"; sourceTree = "<group>"; };
-		1E857309265519AE0050A4D9 /* CHIPClusters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CHIPClusters.cpp; path = "../../../controller/data_model/zap-generated/CHIPClusters.cpp"; sourceTree = "<group>"; };
-		1E85730A265519AE0050A4D9 /* attribute-size.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "attribute-size.cpp"; path = "../../../controller/data_model/zap-generated/attribute-size.cpp"; sourceTree = "<group>"; };
-		1E85730B265519AE0050A4D9 /* IMClusterCommandHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IMClusterCommandHandler.cpp; path = "../../../controller/data_model/zap-generated/IMClusterCommandHandler.cpp"; sourceTree = "<group>"; };
+		1E857305265519720050A4D9 /* CHIPClientCallbacks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CHIPClientCallbacks.cpp; path = "../../../../zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp"; sourceTree = "<group>"; };
+		1E857307265519AE0050A4D9 /* callback-stub.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "callback-stub.cpp"; path = "../../../../zzz_generated/controller-clusters/zap-generated/callback-stub.cpp"; sourceTree = "<group>"; };
+		1E857309265519AE0050A4D9 /* CHIPClusters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CHIPClusters.cpp; path = "../../../../zzz_generated/controller-clusters/zap-generated/CHIPClusters.cpp"; sourceTree = "<group>"; };
+		1E85730A265519AE0050A4D9 /* attribute-size.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "attribute-size.cpp"; path = "../../../../zzz_generated/controller-clusters/zap-generated/attribute-size.cpp"; sourceTree = "<group>"; };
+		1E85730B265519AE0050A4D9 /* IMClusterCommandHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IMClusterCommandHandler.cpp; path = "../../../../zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp"; sourceTree = "<group>"; };
 		1E85731226551A490050A4D9 /* binding-table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "binding-table.cpp"; path = "../../../app/util/binding-table.cpp"; sourceTree = "<group>"; };
 		1E85731326551A490050A4D9 /* process-global-message.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "process-global-message.cpp"; path = "../../../app/util/process-global-message.cpp"; sourceTree = "<group>"; };
 		1E85731426551A490050A4D9 /* attribute-list-byte-span.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "attribute-list-byte-span.cpp"; path = "../../../app/util/attribute-list-byte-span.cpp"; sourceTree = "<group>"; };
@@ -625,8 +625,9 @@
 					"$(CHIP_ROOT)/src/app/util",
 					"$(CHIP_ROOT)/third_party/nlio/repo/include",
 					"$(TEMP_DIR)/out/gen/include",
-					"$(CHIP_ROOT)/src/controller/data_model",
+					"$(CHIP_ROOT)/zzz_generated/",
 					"$(CHIP_ROOT)/zzz_generated/app-common",
+					"$(CHIP_ROOT)/zzz_generated/controller-clusters",
 				);
 				INFOPLIST_FILE = CHIP/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -768,8 +769,9 @@
 					"$(CHIP_ROOT)/src/app/util",
 					"$(CHIP_ROOT)/third_party/nlio/repo/include",
 					"$(TEMP_DIR)/out/gen/include",
-					"$(CHIP_ROOT)/src/controller/data_model",
+					"$(CHIP_ROOT)/zzz_generated/",
 					"$(CHIP_ROOT)/zzz_generated/app-common",
+					"$(CHIP_ROOT)/zzz_generated/controller-clusters",
 				);
 				INFOPLIST_FILE = CHIP/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
diff --git a/src/controller/data_model/zap-generated/CHIPClientCallbacks.cpp b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp
similarity index 100%
rename from src/controller/data_model/zap-generated/CHIPClientCallbacks.cpp
rename to zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp
diff --git a/src/controller/data_model/zap-generated/CHIPClientCallbacks.h b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h
similarity index 100%
rename from src/controller/data_model/zap-generated/CHIPClientCallbacks.h
rename to zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h
diff --git a/src/controller/data_model/zap-generated/CHIPClusters.cpp b/zzz_generated/controller-clusters/zap-generated/CHIPClusters.cpp
similarity index 100%
rename from src/controller/data_model/zap-generated/CHIPClusters.cpp
rename to zzz_generated/controller-clusters/zap-generated/CHIPClusters.cpp
diff --git a/src/controller/data_model/zap-generated/CHIPClusters.h b/zzz_generated/controller-clusters/zap-generated/CHIPClusters.h
similarity index 100%
rename from src/controller/data_model/zap-generated/CHIPClusters.h
rename to zzz_generated/controller-clusters/zap-generated/CHIPClusters.h
diff --git a/src/controller/data_model/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp
similarity index 100%
rename from src/controller/data_model/zap-generated/IMClusterCommandHandler.cpp
rename to zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp
diff --git a/src/controller/data_model/zap-generated/af-gen-event.h b/zzz_generated/controller-clusters/zap-generated/af-gen-event.h
similarity index 100%
rename from src/controller/data_model/zap-generated/af-gen-event.h
rename to zzz_generated/controller-clusters/zap-generated/af-gen-event.h
diff --git a/src/controller/data_model/zap-generated/attribute-size.cpp b/zzz_generated/controller-clusters/zap-generated/attribute-size.cpp
similarity index 100%
rename from src/controller/data_model/zap-generated/attribute-size.cpp
rename to zzz_generated/controller-clusters/zap-generated/attribute-size.cpp
diff --git a/src/controller/data_model/zap-generated/callback-stub.cpp b/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp
similarity index 100%
rename from src/controller/data_model/zap-generated/callback-stub.cpp
rename to zzz_generated/controller-clusters/zap-generated/callback-stub.cpp
diff --git a/src/controller/data_model/zap-generated/endpoint_config.h b/zzz_generated/controller-clusters/zap-generated/endpoint_config.h
similarity index 100%
rename from src/controller/data_model/zap-generated/endpoint_config.h
rename to zzz_generated/controller-clusters/zap-generated/endpoint_config.h
diff --git a/src/controller/data_model/zap-generated/gen_config.h b/zzz_generated/controller-clusters/zap-generated/gen_config.h
similarity index 100%
rename from src/controller/data_model/zap-generated/gen_config.h
rename to zzz_generated/controller-clusters/zap-generated/gen_config.h
diff --git a/src/controller/data_model/zap-generated/gen_tokens.h b/zzz_generated/controller-clusters/zap-generated/gen_tokens.h
similarity index 100%
rename from src/controller/data_model/zap-generated/gen_tokens.h
rename to zzz_generated/controller-clusters/zap-generated/gen_tokens.h