diff --git a/boards.txt b/boards.txt
index 909874fc6d4..8e9655cda48 100644
--- a/boards.txt
+++ b/boards.txt
@@ -450,15 +450,24 @@ esp32h2.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
 #esp32h2.menu.PartitionScheme.rainmaker_8MB=RainMaker 8MB
 #esp32h2.menu.PartitionScheme.rainmaker_8MB.build.partitions=rainmaker_8MB
 #esp32h2.menu.PartitionScheme.rainmaker_8MB.upload.maximum_size=4116480
-esp32h2.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
-esp32h2.menu.PartitionScheme.zigbee.build.partitions=zigbee
-esp32h2.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
 esp32h2.menu.PartitionScheme.zigbee_2MB=Zigbee 2MB with spiffs
 esp32h2.menu.PartitionScheme.zigbee_2MB.build.partitions=zigbee_2MB
 esp32h2.menu.PartitionScheme.zigbee_2MB.upload.maximum_size=1310720
+esp32h2.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
+esp32h2.menu.PartitionScheme.zigbee.build.partitions=zigbee
+esp32h2.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
+esp32h2.menu.PartitionScheme.zigbee_8MB=Zigbee 8MB with spiffs
+esp32h2.menu.PartitionScheme.zigbee_8MB.build.partitions=zigbee_8MB
+esp32h2.menu.PartitionScheme.zigbee_8MB.upload.maximum_size=3407872
+esp32h2.menu.PartitionScheme.zigbee_zczr_2MB=Zigbee ZCZR 2MB with spiffs
+esp32h2.menu.PartitionScheme.zigbee_zczr_2MB.build.partitions=zigbee_zczr_2MB
+esp32h2.menu.PartitionScheme.zigbee_zczr_2MB.upload.maximum_size=1310720
 esp32h2.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
 esp32h2.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
 esp32h2.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
+esp32h2.menu.PartitionScheme.zigbee_zczr_8MB=Zigbee ZCZR 8MB with spiffs
+esp32h2.menu.PartitionScheme.zigbee_zczr_8MB.build.partitions=zigbee_zczr_8MB
+esp32h2.menu.PartitionScheme.zigbee_zczr_8MB.upload.maximum_size=3407872
 esp32h2.menu.PartitionScheme.custom=Custom
 esp32h2.menu.PartitionScheme.custom.build.partitions=
 esp32h2.menu.PartitionScheme.custom.upload.maximum_size=16777216
@@ -645,15 +654,24 @@ esp32c6.menu.PartitionScheme.rainmaker_4MB.upload.maximum_size=4038656
 esp32c6.menu.PartitionScheme.rainmaker_8MB=RainMaker 8MB
 esp32c6.menu.PartitionScheme.rainmaker_8MB.build.partitions=rainmaker_8MB
 esp32c6.menu.PartitionScheme.rainmaker_8MB.upload.maximum_size=4116480
-esp32c6.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
-esp32c6.menu.PartitionScheme.zigbee.build.partitions=zigbee
-esp32c6.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
 esp32c6.menu.PartitionScheme.zigbee_2MB=Zigbee 2MB with spiffs
 esp32c6.menu.PartitionScheme.zigbee_2MB.build.partitions=zigbee_2MB
 esp32c6.menu.PartitionScheme.zigbee_2MB.upload.maximum_size=1310720
+esp32c6.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
+esp32c6.menu.PartitionScheme.zigbee.build.partitions=zigbee
+esp32c6.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
+esp32c6.menu.PartitionScheme.zigbee_8MB=Zigbee 8MB with spiffs
+esp32c6.menu.PartitionScheme.zigbee_8MB.build.partitions=zigbee_8MB
+esp32c6.menu.PartitionScheme.zigbee_8MB.upload.maximum_size=3407872
+esp32c6.menu.PartitionScheme.zigbee_zczr_2MB=Zigbee ZCZR 2MB with spiffs
+esp32c6.menu.PartitionScheme.zigbee_zczr_2MB.build.partitions=zigbee_zczr_2MB
+esp32c6.menu.PartitionScheme.zigbee_zczr_2MB.upload.maximum_size=1310720
 esp32c6.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
 esp32c6.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
 esp32c6.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
+esp32c6.menu.PartitionScheme.zigbee_zczr_8MB=Zigbee ZCZR 8MB with spiffs
+esp32c6.menu.PartitionScheme.zigbee_zczr_8MB.build.partitions=zigbee_zczr_8MB
+esp32c6.menu.PartitionScheme.zigbee_zczr_8MB.upload.maximum_size=3407872
 esp32c6.menu.PartitionScheme.custom=Custom
 esp32c6.menu.PartitionScheme.custom.build.partitions=
 esp32c6.menu.PartitionScheme.custom.upload.maximum_size=16777216
diff --git a/tools/partitions/zigbee_2MB.csv b/tools/partitions/zigbee_2MB.csv
index 18adb6358bd..7034f9bd49b 100644
--- a/tools/partitions/zigbee_2MB.csv
+++ b/tools/partitions/zigbee_2MB.csv
@@ -1,6 +1,6 @@
 # Name,     Type, SubType, Offset,  Size, Flags
 nvs,        data, nvs,     0x9000,  0x5000,
-factory,    app,  factory, 0x10000,  0x140000,
+factory,    app,  factory, 0x10000, 0x140000,
 spiffs,     data, spiffs,  0x150000,0x9B000,
 zb_storage, data, fat,     0x1EB000,0x4000,
 zb_fct,     data, fat,     0x1EF000,0x1000,
diff --git a/tools/partitions/zigbee_8MB.csv b/tools/partitions/zigbee_8MB.csv
new file mode 100644
index 00000000000..fdf46fb59d1
--- /dev/null
+++ b/tools/partitions/zigbee_8MB.csv
@@ -0,0 +1,9 @@
+# Name,     Type, SubType, Offset,  Size, Flags
+nvs,        data, nvs,     0x9000,  0x5000,
+otadata,    data, ota,     0xe000,  0x2000,
+app0,       app,  ota_0,   0x10000, 0x340000,
+app1,       app,  ota_1,   0x350000,0x340000,
+spiffs,     data, spiffs,  0x690000,0x15B000,
+zb_storage, data, fat,     0x7EB000,0x4000,
+zb_fct,     data, fat,     0x7EF000,0x1000,
+coredump,   data, coredump,0x7F0000,0x10000,
diff --git a/tools/partitions/zigbee_zczr_2MB.csv b/tools/partitions/zigbee_zczr_2MB.csv
new file mode 100644
index 00000000000..10484eeed87
--- /dev/null
+++ b/tools/partitions/zigbee_zczr_2MB.csv
@@ -0,0 +1,8 @@
+# Name,     Type, SubType, Offset,  Size, Flags
+nvs,        data, nvs,     0x9000,  0x5000,
+factory,    app,  factory, 0x10000, 0x140000,
+spiffs,     data, spiffs,  0x150000,0x9A000,
+zb_storage, data, fat,     0x1EA000,0x4000,
+zb_fct,     data, fat,     0x1EE000,0x1000,
+rcp_fw,     data, spiffs,  0x1EF000,0x1000,
+coredump,   data, coredump,0x1F0000,0x10000,
diff --git a/tools/partitions/zigbee_zczr_8MB.csv b/tools/partitions/zigbee_zczr_8MB.csv
new file mode 100644
index 00000000000..70dd680dc1a
--- /dev/null
+++ b/tools/partitions/zigbee_zczr_8MB.csv
@@ -0,0 +1,10 @@
+# Name,     Type, SubType, Offset,  Size, Flags
+nvs,        data, nvs,     0x9000,  0x5000,
+otadata,    data, ota,     0xe000,  0x2000,
+app0,       app,  ota_0,   0x10000, 0x340000,
+app1,       app,  ota_1,   0x350000,0x340000,
+spiffs,     data, spiffs,  0x690000,0x15A000,
+zb_storage, data, fat,     0x7EA000,0x4000,
+zb_fct,     data, fat,     0x7EE000,0x1000,
+rcp_fw,     data, spiffs,  0x7EF000,0x1000,
+coredump,   data, coredump,0x7F0000,0x10000,