diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index d742598edb1614..67f13a18e28168 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -93,6 +93,8 @@ jobs:
--log-level info \
src/app/zap-templates/zcl/data-model/chip/global-attributes.xml \
src/app/zap-templates/zcl/data-model/chip/chime-cluster.xml \
+ src/app/zap-templates/zcl/data-model/chip/closure-control-cluster.xml \
+ src/app/zap-templates/zcl/data-model/chip/closure-dimension-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/global-bitmaps.xml \
src/app/zap-templates/zcl/data-model/chip/global-enums.xml \
src/app/zap-templates/zcl/data-model/chip/global-structs.xml \
diff --git a/scripts/rules.matterlint b/scripts/rules.matterlint
index ad2a2b04a190da..df4b9aaa799b24 100644
--- a/scripts/rules.matterlint
+++ b/scripts/rules.matterlint
@@ -20,6 +20,8 @@ load "../src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/chime-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/chip-ota.xml";
load "../src/app/zap-templates/zcl/data-model/chip/chip-types.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/closure-control-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/closure-dimension-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/clusters-extensions.xml";
load "../src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml";
diff --git a/src/app/zap-templates/zcl/data-model/chip/closure-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/closure-control-cluster.xml
new file mode 100644
index 00000000000000..6aaefa22355f88
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/closure-control-cluster.xml
@@ -0,0 +1,261 @@
+
+
+
+
+
+
+
+ 0x0104
+ CLOSURE_CONTROL_CLUSTER
+
+ true
+ true
+
+
+ CountdownTime
+
+
+ MainState
+ CurrentErrorList
+ OverallState
+ OverallTarget
+
+ RestingProcedure
+
+
+
+
+
+ TriggerCondition
+
+
+
+
+
+ TriggerPosition
+
+
+
+
+
+ WaitingDelay
+
+
+
+
+
+ KickoffTimer
+
+
+
+
+
+ On receipt of this command, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted.
+
+
+
+
+
+
+
+
+ Upon receipt, this SHALL move the product in the most fitting state following the data as follows:
+
+
+
+
+
+
+ Upon receipt, this SHALL initiate a calibration.
+
+
+
+
+
+
+
+ Upon receipt, this SHALL configure the Fallback feature behavior using the data as follows:
+
+
+
+
+
+
+
+
+
+
+ Upon receipt, this SHALL cancel the current PendingFallback.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/zap-templates/zcl/data-model/chip/closure-dimension-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/closure-dimension-cluster.xml
new file mode 100644
index 00000000000000..e3c17da3193a4a
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/closure-dimension-cluster.xml
@@ -0,0 +1,902 @@
+
+
+
+
+
+
+
+
+
+
+
+ 0x0107
+ CLOSURE_3_RD_DIMENSION_CLUSTER
+ Ceiling values are dedicated for closures that close a ceiling, such as horizontal awnings, pergolas, etc.
+ true
+ true
+
+
+ TagList
+
+
+ Current
+ Target
+
+ Resolution
+
+
+
+
+
+ StepValue
+
+
+
+
+
+ Unit
+
+
+
+
+
+ UnitRange
+
+
+
+
+
+ LimitRange
+
+
+
+
+
+ TranslationDirection
+
+
+
+
+
+ RotationAxis
+
+
+
+
+
+ Overflow
+
+
+
+
+
+
+
+
+
+
+ ModulationType
+
+
+
+
+
+ LatchingAxis
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Upon receipt, this SHALL move the product's dimension in the most fitting state following the data as follows:
+
+
+
+
+
+
+ Upon receipt, this SHALL update the Target.Position attribute value e.g. by sending multiple commands with short step by step or a single command with multiple steps.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Closures
+ Closure 4th Dimension
+ 0x0108
+ CLOSURE_4_TH_DIMENSION_CLUSTER
+ Ceiling values are dedicated for closures that close a ceiling, such as horizontal awnings, pergolas, etc.
+ true
+ true
+
+
+ TagList
+
+
+ Current
+ Target
+
+ Resolution
+
+
+
+
+
+ StepValue
+
+
+
+
+
+ Unit
+
+
+
+
+
+ UnitRange
+
+
+
+
+
+ LimitRange
+
+
+
+
+
+ TranslationDirection
+
+
+
+
+
+ RotationAxis
+
+
+
+
+
+ Overflow
+
+
+
+
+
+
+
+
+
+
+ ModulationType
+
+
+
+
+
+ LatchingAxis
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Upon receipt, this SHALL move the product's dimension in the most fitting state following the data as follows:
+
+
+
+
+
+
+ Upon receipt, this SHALL update the Target.Position attribute value e.g. by sending multiple commands with short step by step or a single command with multiple steps.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Closures
+ Closure 5th Dimension
+ 0x0109
+ CLOSURE_5_TH_DIMENSION_CLUSTER
+ Ceiling values are dedicated for closures that close a ceiling, such as horizontal awnings, pergolas, etc.
+ true
+ true
+
+
+ TagList
+
+
+ Current
+ Target
+
+ Resolution
+
+
+
+
+
+ StepValue
+
+
+
+
+
+ Unit
+
+
+
+
+
+ UnitRange
+
+
+
+
+
+ LimitRange
+
+
+
+
+
+ TranslationDirection
+
+
+
+
+
+ RotationAxis
+
+
+
+
+
+ Overflow
+
+
+
+
+
+
+
+
+
+
+ ModulationType
+
+
+
+
+
+ LatchingAxis
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Upon receipt, this SHALL move the product's dimension in the most fitting state following the data as follows:
+
+
+
+
+
+
+ Upon receipt, this SHALL update the Target.Position attribute value e.g. by sending multiple commands with short step by step or a single command with multiple steps.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Closures
+ Closure 1st Dimension
+ 0x0105
+ CLOSURE_1_ST_DIMENSION_CLUSTER
+ Ceiling values are dedicated for closures that close a ceiling, such as horizontal awnings, pergolas, etc.
+ true
+ true
+
+
+ TagList
+
+
+ Current
+ Target
+
+ Resolution
+
+
+
+
+
+ StepValue
+
+
+
+
+
+ Unit
+
+
+
+
+
+ UnitRange
+
+
+
+
+
+ LimitRange
+
+
+
+
+
+ TranslationDirection
+
+
+
+
+
+ RotationAxis
+
+
+
+
+
+ Overflow
+
+
+
+
+
+
+
+
+
+
+ ModulationType
+
+
+
+
+
+ LatchingAxis
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Upon receipt, this SHALL move the product's dimension in the most fitting state following the data as follows:
+
+
+
+
+
+
+ Upon receipt, this SHALL update the Target.Position attribute value e.g. by sending multiple commands with short step by step or a single command with multiple steps.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Closures
+ Closure 2nd Dimension
+ 0x0106
+ CLOSURE_2_ND_DIMENSION_CLUSTER
+ Ceiling values are dedicated for closures that close a ceiling, such as horizontal awnings, pergolas, etc.
+ true
+ true
+
+
+ TagList
+
+
+ Current
+ Target
+
+ Resolution
+
+
+
+
+
+ StepValue
+
+
+
+
+
+ Unit
+
+
+
+
+
+ UnitRange
+
+
+
+
+
+ LimitRange
+
+
+
+
+
+ TranslationDirection
+
+
+
+
+
+ RotationAxis
+
+
+
+
+
+ Overflow
+
+
+
+
+
+
+
+
+
+
+ ModulationType
+
+
+
+
+
+ LatchingAxis
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Upon receipt, this SHALL move the product's dimension in the most fitting state following the data as follows:
+
+
+
+
+
+
+ Upon receipt, this SHALL update the Target.Position attribute value e.g. by sending multiple commands with short step by step or a single command with multiple steps.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 84b5720e165fe1..d16ae3afa665b3 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
@@ -1,5 +1,4 @@
-