diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
index f954fcfc8e579f..dcd0d18c99b139 100644
--- a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
@@ -936,6 +936,286 @@ limitations under the License.
+
+ MA-closurebase
+ CHIP
+ ClosureBase
+ 0x0103
+ 0x0230
+ Simple
+ Endpoint
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MA-window
+ CHIP
+ Window
+ 0x0103
+ 0x0231
+ Simple
+ Endpoint
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MA-shutter
+ CHIP
+ Shutter
+ 0x0103
+ 0x0232
+ Simple
+ Endpoint
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MA-shade
+ CHIP
+ Shade
+ 0x0103
+ 0x0233
+ Simple
+ Endpoint
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MA-curtain
+ CHIP
+ Curtain
+ 0x0103
+ 0x0234
+ Simple
+ Endpoint
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MA-blind
+ CHIP
+ Blind
+ 0x0103
+ 0x0235
+ Simple
+ Endpoint
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MA-screen
+ CHIP
+ Screen
+ 0x0103
+ 0x0236
+ Simple
+ Endpoint
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MA-awning
+ CHIP
+ Awning
+ 0x0103
+ 0x0237
+ Simple
+ Endpoint
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MA-pergola
+ CHIP
+ Pergola
+ 0x0103
+ 0x0238
+ Simple
+ Endpoint
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MA-door
+ CHIP
+ Door
+ 0x0103
+ 0x0239
+ Simple
+ Endpoint
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MA-garagedoor
+ CHIP
+ GarageDoor
+ 0x0103
+ 0x023A
+ Simple
+ Endpoint
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MA-gate
+ CHIP
+ Gate
+ 0x0103
+ 0x023B
+ Simple
+ Endpoint
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MA-barrier
+ CHIP
+ Barrier
+ 0x0103
+ 0x023C
+ Simple
+ Endpoint
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MA-cabinet
+ CHIP
+ Cabinet
+ 0x0103
+ 0x023D
+ Simple
+ Endpoint
+
+
+
+
+
+
+
+
+
+
+
+
MA-pump
CHIP
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
index b5494ff0ba0cbe..4ee7dc5ca8779e 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
@@ -7709,6 +7709,20 @@ typedef NS_ENUM(uint32_t, MTRDeviceTypeIDType) {
MTRDeviceTypeIDTypeCameraID MTR_PROVISIONALLY_AVAILABLE = 0x00000142,
MTRDeviceTypeIDTypeWindowCoveringID MTR_AVAILABLE(ios(18.2), macos(15.2), watchos(11.2), tvos(18.2)) = 0x00000202,
MTRDeviceTypeIDTypeWindowCoveringControllerID MTR_AVAILABLE(ios(18.2), macos(15.2), watchos(11.2), tvos(18.2)) = 0x00000203,
+ MTRDeviceTypeIDTypeClosureBaseID MTR_PROVISIONALLY_AVAILABLE = 0x00000230,
+ MTRDeviceTypeIDTypeWindowID MTR_PROVISIONALLY_AVAILABLE = 0x00000231,
+ MTRDeviceTypeIDTypeShutterID MTR_PROVISIONALLY_AVAILABLE = 0x00000232,
+ MTRDeviceTypeIDTypeShadeID MTR_PROVISIONALLY_AVAILABLE = 0x00000233,
+ MTRDeviceTypeIDTypeCurtainID MTR_PROVISIONALLY_AVAILABLE = 0x00000234,
+ MTRDeviceTypeIDTypeBlindID MTR_PROVISIONALLY_AVAILABLE = 0x00000235,
+ MTRDeviceTypeIDTypeScreenID MTR_PROVISIONALLY_AVAILABLE = 0x00000236,
+ MTRDeviceTypeIDTypeAwningID MTR_PROVISIONALLY_AVAILABLE = 0x00000237,
+ MTRDeviceTypeIDTypePergolaID MTR_PROVISIONALLY_AVAILABLE = 0x00000238,
+ MTRDeviceTypeIDTypeDoorID MTR_PROVISIONALLY_AVAILABLE = 0x00000239,
+ MTRDeviceTypeIDTypeGarageDoorID MTR_PROVISIONALLY_AVAILABLE = 0x0000023A,
+ MTRDeviceTypeIDTypeGateID MTR_PROVISIONALLY_AVAILABLE = 0x0000023B,
+ MTRDeviceTypeIDTypeBarrierID MTR_PROVISIONALLY_AVAILABLE = 0x0000023C,
+ MTRDeviceTypeIDTypeCabinetID MTR_PROVISIONALLY_AVAILABLE = 0x0000023D,
MTRDeviceTypeIDTypeHeatingCoolingUnitID MTR_AVAILABLE(ios(18.2), macos(15.2), watchos(11.2), tvos(18.2)) = 0x00000300,
MTRDeviceTypeIDTypeThermostatID MTR_AVAILABLE(ios(18.2), macos(15.2), watchos(11.2), tvos(18.2)) = 0x00000301,
MTRDeviceTypeIDTypeTemperatureSensorID MTR_AVAILABLE(ios(18.2), macos(15.2), watchos(11.2), tvos(18.2)) = 0x00000302,
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm b/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
index a1d790b8a901cb..279e77c321e47e 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
@@ -82,6 +82,20 @@
{ 0x00000142, MTRDeviceTypeClass::Simple, @"Camera" },
{ 0x00000202, MTRDeviceTypeClass::Simple, @"Window Covering" },
{ 0x00000203, MTRDeviceTypeClass::Simple, @"Window Covering Controller" },
+ { 0x00000230, MTRDeviceTypeClass::Simple, @"ClosureBase" },
+ { 0x00000231, MTRDeviceTypeClass::Simple, @"Window" },
+ { 0x00000232, MTRDeviceTypeClass::Simple, @"Shutter" },
+ { 0x00000233, MTRDeviceTypeClass::Simple, @"Shade" },
+ { 0x00000234, MTRDeviceTypeClass::Simple, @"Curtain" },
+ { 0x00000235, MTRDeviceTypeClass::Simple, @"Blind" },
+ { 0x00000236, MTRDeviceTypeClass::Simple, @"Screen" },
+ { 0x00000237, MTRDeviceTypeClass::Simple, @"Awning" },
+ { 0x00000238, MTRDeviceTypeClass::Simple, @"Pergola" },
+ { 0x00000239, MTRDeviceTypeClass::Simple, @"Door" },
+ { 0x0000023A, MTRDeviceTypeClass::Simple, @"GarageDoor" },
+ { 0x0000023B, MTRDeviceTypeClass::Simple, @"Gate" },
+ { 0x0000023C, MTRDeviceTypeClass::Simple, @"Barrier" },
+ { 0x0000023D, MTRDeviceTypeClass::Simple, @"Cabinet" },
{ 0x00000300, MTRDeviceTypeClass::Simple, @"Heating/Cooling Unit" },
{ 0x00000301, MTRDeviceTypeClass::Simple, @"Thermostat" },
{ 0x00000302, MTRDeviceTypeClass::Simple, @"Temperature Sensor" },
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp
index 4b53ea920fe0e8..1d14563a3de866 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp
@@ -6713,6 +6713,34 @@ char const * DeviceTypeIdToText(chip::DeviceTypeId id)
return "Window Covering";
case 0x00000203:
return "Window Covering Controller";
+ case 0x00000230:
+ return "ClosureBase";
+ case 0x00000231:
+ return "Window";
+ case 0x00000232:
+ return "Shutter";
+ case 0x00000233:
+ return "Shade";
+ case 0x00000234:
+ return "Curtain";
+ case 0x00000235:
+ return "Blind";
+ case 0x00000236:
+ return "Screen";
+ case 0x00000237:
+ return "Awning";
+ case 0x00000238:
+ return "Pergola";
+ case 0x00000239:
+ return "Door";
+ case 0x0000023A:
+ return "GarageDoor";
+ case 0x0000023B:
+ return "Gate";
+ case 0x0000023C:
+ return "Barrier";
+ case 0x0000023D:
+ return "Cabinet";
case 0x00000300:
return "Heating/Cooling Unit";
case 0x00000301: