diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 5eb897a4da8d5d..ffc0644df2c889 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -116,6 +116,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml \
@@ -131,6 +132,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/fault-injection-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml \
@@ -149,6 +151,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml \
@@ -166,6 +169,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/test-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml \
@@ -177,10 +181,10 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/window-covering.xml \
                       src/app/zap-templates/zcl/data-model/chip/matter-devices.xml \
                       src/app/zap-templates/zcl/data-model/draft/barrier-control-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml \
                       src/app/zap-templates/zcl/data-model/draft/input-output-value-clusters.xml \
                       src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml \
                       src/app/zap-templates/zcl/data-model/silabs/ha-devices.xml \
-                      src/app/zap-templates/zcl/data-model/silabs/ha.xml \
                       src/app/zap-templates/zcl/data-model/silabs/lo-devices.xml \
                       src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml \
                       src/app/zap-templates/zcl/data-model/silabs/zll-devices.xml \
diff --git a/scripts/rules.matterlint b/scripts/rules.matterlint
index 18f2c3bd94259e..21609bd813f5ca 100644
--- a/scripts/rules.matterlint
+++ b/scripts/rules.matterlint
@@ -8,6 +8,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-c
 load "../src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml";
@@ -23,6 +24,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml";
@@ -41,6 +43,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml";
@@ -58,6 +61,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/test-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml";
@@ -68,6 +72,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/window-covering.xml";
 load "../src/app/zap-templates/zcl/data-model/draft/barrier-control-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/draft/input-output-value-clusters.xml";
 load "../src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml";
 
diff --git a/scripts/tests/chiptest/yamltest_with_chip_repl_tester.py b/scripts/tests/chiptest/yamltest_with_chip_repl_tester.py
index 7738539898c4c6..f852d30c9b4a53 100644
--- a/scripts/tests/chiptest/yamltest_with_chip_repl_tester.py
+++ b/scripts/tests/chiptest/yamltest_with_chip_repl_tester.py
@@ -96,9 +96,6 @@ def _StackShutDown():
             # Creating Cluster definition.
             clusters_definitions = SpecDefinitionsFromPaths([
                 _CLUSTER_XML_DIRECTORY_PATH + '/chip/*.xml',
-
-                # Some still-silabs clusters
-                _CLUSTER_XML_DIRECTORY_PATH + '/silabs/ha.xml',  # For fan control
             ])
 
             # Parsing YAML test and setting up chip-repl yamltests runner.
diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml
index 70046f711b897c..8d9da386fbed1d 100644
--- a/src/app/zap-templates/zcl/data-model/all.xml
+++ b/src/app/zap-templates/zcl/data-model/all.xml
@@ -6,6 +6,7 @@
    <xi:include href="chip/application-basic-cluster.xml" />
    <xi:include href="chip/application-launcher-cluster.xml" />
    <xi:include href="chip/audio-output-cluster.xml" />
+   <xi:include href="chip/ballast-configuration-cluster.xml" />
    <xi:include href="chip/basic-information-cluster.xml" />
    <xi:include href="chip/binding-cluster.xml" />
    <xi:include href="chip/boolean-state-cluster.xml" />
@@ -21,6 +22,7 @@
    <xi:include href="chip/diagnostic-logs-cluster.xml" />
    <xi:include href="chip/door-lock-cluster.xml" />
    <xi:include href="chip/ethernet-network-diagnostics-cluster.xml" />
+   <xi:include href="chip/fan-control-cluster.xml" />   
    <xi:include href="chip/fault-injection-cluster.xml" />   
    <xi:include href="chip/fixed-label-cluster.xml" />
    <xi:include href="chip/flow-measurement-cluster.xml" />
@@ -39,6 +41,7 @@
    <xi:include href="chip/media-playback-cluster.xml" />
    <xi:include href="chip/mode-select-cluster.xml" />
    <xi:include href="chip/network-commissioning-cluster.xml" />
+   <xi:include href="chip/occupancy-sensing-cluster.xml" />
    <xi:include href="chip/onoff-cluster.xml" />
    <xi:include href="chip/operational-credentials-cluster.xml" />
    <xi:include href="chip/pressure-measurement-cluster.xml" />
@@ -56,6 +59,7 @@
    <xi:include href="chip/target-navigator-cluster.xml" />
    <xi:include href="chip/temperature-measurement-cluster.xml" />
    <xi:include href="chip/test-cluster.xml" />
+   <xi:include href="chip/thermostat-user-interface-configuration-cluster.xml" />
    <xi:include href="chip/thermostat-cluster.xml" />
    <xi:include href="chip/thread-network-diagnostics-cluster.xml" />
    <xi:include href="chip/time-format-localization-cluster.xml" />
@@ -68,10 +72,10 @@
    <xi:include href="chip/window-covering.xml" />
    <xi:include href="chip/matter-devices.xml" />
    <xi:include href="draft/barrier-control.xml" />
+   <xi:include href="draft/electrical-measurement-cluster.xml" />
    <xi:include href="draft/input-output-value-clusters.xml" />
    <xi:include href="draft/onoff-switch-configuration-cluster.xml" />
    <xi:include href="silabs/ha-devices.xml" />
-   <xi:include href="silabs/ha.xml" />
    <xi:include href="silabs/lo-devices.xml" />
    <xi:include href="silabs/types-silabs.xml" />
    <xi:include href="silabs/zll-devices.xml" />
diff --git a/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml
new file mode 100644
index 00000000000000..90fb658802194f
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <domain name="Lighting"/>
+
+  <cluster>
+    <name>Ballast Configuration</name>
+    <domain>Lighting</domain>
+    <description>Attributes and commands for configuring a lighting ballast.</description>
+    <code>0x0301</code>
+    <define>BALLAST_CONFIGURATION_CLUSTER</define>
+
+    <client tick="false" init="false">true</client>
+    <server tick="false" init="false">true</server>
+
+    <globalAttribute side="either" code="0xFFFD" value="4"/>
+
+    <!-- Ballast Configuration Attribute Set -->
+    <attribute side="server" code="0x0000" define="PHYSICAL_MIN_LEVEL" type="INT8U" min="0x01" max="0xFE" writable="false" default="0x01" optional="false">PhysicalMinLevel</attribute>
+    <attribute side="server" code="0x0001" define="PHYSICAL_MAX_LEVEL" type="INT8U" min="0x01" max="0xFE" writable="false" default="0xFE" optional="false">PhysicalMaxLevel</attribute>
+    <attribute side="server" code="0x0002" define="BALLAST_STATUS" type="BITMAP8" min="0x00" max="0x03" writable="false" default="0x00" optional="true">BallastStatus</attribute>
+    <!-- Ballast Settings Attribute Set -->
+    <attribute side="server" code="0x0010" define="MIN_LEVEL" type="INT8U" min="0x01" max="0xFE" writable="true" default="0x01" optional="false">MinLevel</attribute>
+    <attribute side="server" code="0x0011" define="MAX_LEVEL" type="INT8U" min="0x01" max="0xFE" writable="true" default="0xFE" optional="false">MaxLevel</attribute>
+    <!-- PowerOnLevel and PowerOnFadeTime are deprecated -->
+    <attribute side="server" code="0x0014" define="INTRINSIC_BALLAST_FACTOR" type="INT8U" writable="true" isNullable="true" optional="true">IntrinsicBallastFactor</attribute>
+    <attribute side="server" code="0x0015" define="BALLAST_FACTOR_ADJUSTMENT" type="INT8U" min="0x64" writable="true" default="0xFF" isNullable="true" optional="true">BallastFactorAdjustment</attribute>
+    <!-- Lamp Information Attribute Set -->
+    <attribute side="server" code="0x0020" define="LAMP_QUANTITY" type="INT8U" writable="false" optional="false">LampQuantity</attribute>
+    <!-- Lamp Settings Attribute Set -->
+    <attribute side="server" code="0x0030" define="LAMP_TYPE" type="CHAR_STRING" length="16" writable="true" optional="true">LampType</attribute>
+    <attribute side="server" code="0x0031" define="LAMP_MANUFACTURER" type="CHAR_STRING" length="16" writable="true" optional="true">LampManufacturer</attribute>
+    <attribute side="server" code="0x0032" define="LAMP_RATED_HOURS" type="INT24U" writable="true" default="0xFFFFFF" isNullable="true" optional="true">LampRatedHours</attribute>
+    <attribute side="server" code="0x0033" define="LAMP_BURN_HOURS" type="INT24U" writable="true" default="0x000000" isNullable="true" optional="true">LampBurnHours</attribute>
+    <attribute side="server" code="0x0034" define="LAMP_ALARM_MODE" type="BITMAP8" min="0x00" max="0x01" writable="true" default="0x00" optional="true">LampAlarmMode</attribute>
+    <attribute side="server" code="0x0035" define="LAMP_BURN_HOURS_TRIP_POINT" type="INT24U" writable="true" default="0xFFFFFF" isNullable="true" optional="true">LampBurnHoursTripPoint</attribute>
+  </cluster>
+</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml
new file mode 100644
index 00000000000000..53d7b4c107c483
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <domain name="HVAC"/>
+
+  <bitmap name="FanControlFeature" type="BITMAP32">
+    <cluster code="0x0202" />
+    <field name="Multi-Speed" mask="0x01" />
+    <field name="Auto" mask="0x02" />
+    <field name="Rocking" mask="0x04" />
+    <field name="Wind" mask="0x08" />
+  </bitmap>
+
+  <enum name="FanModeType" type="ENUM8">
+    <cluster code="0x0202"/>
+    <item name="Off" value="0x00"/>
+    <item name="Low" value="0x01"/>
+    <item name="Medium" value="0x02"/>
+    <item name="High" value="0x03"/>
+    <item name="On" value="0x04"/>
+    <item name="Auto" value="0x05"/>
+    <item name="Smart" value="0x06"/>
+  </enum>
+
+  <enum name="FanModeSequenceType" type="ENUM8">
+    <cluster code="0x0202"/>
+    <item name="Off/Low/Med/High" value="0x00"/>
+    <item name="Off/Low/High" value="0x01"/>
+    <item name="Off/Low/Med/High/Auto" value="0x02"/>
+    <item name="Off/Low/High/Auto" value="0x03"/>
+    <item name="Off/On/Auto" value="0x04"/>
+    <item name="Off/On" value="0x05"/>
+  </enum>
+
+  <bitmap name="RockSupportMask" type="BITMAP8">
+    <cluster code="0x0202" />
+    <field name="RockLeftRight" mask="0x01" />
+    <field name="RockUpDown" mask="0x02" />
+    <field name="RockRound" mask="0x04" />
+  </bitmap>
+
+  <bitmap name="WindSupportMask" type="BITMAP8">
+    <cluster code="0x0202" />
+    <field name="Sleep Wind" mask="0x01" />
+    <field name="Natural Wind" mask="0x02" />
+  </bitmap>
+
+  <bitmap name="WindSettingMask" type="BITMAP8">
+    <cluster code="0x0202" />
+    <field name="Sleep Wind" mask="0x01" />
+    <field name="Natural Wind" mask="0x02" />
+  </bitmap>
+
+  <cluster>
+    <name>Fan Control</name>
+    <domain>HVAC</domain>
+    <description>An interface for controlling a fan in a heating/cooling system.</description>
+    <code>0x0202</code>
+    <define>FAN_CONTROL_CLUSTER</define>
+
+    <client tick="false" init="false">true</client>
+    <server tick="false" init="false">true</server>
+
+    <attribute side="server" code="0x0000" define="FAN_MODE" type="FanModeType" min="0" max="6" writable="true" default="0" optional="false">FanMode</attribute>
+    <attribute side="server" code="0x0001" define="FAN_MODE_SEQUENCE" type="FanModeSequenceType" min="0" max="5" writable="true" default="2" optional="false">FanModeSequence</attribute>
+    <attribute side="server" code="0x0002" define="PERCENT_SETTING" type="INT8U" min="0" max="100" writable="true" default="0" isNullable="true" optional="false">PercentSetting</attribute>
+    <attribute side="server" code="0x0003" define="PERCENT_CURRENT" type="INT8U" min="0" max="100" writable="false" default="0" optional="false">PercentCurrent</attribute>
+    <attribute side="server" code="0x0004" define="SPEED_MAX" type="INT8U" min="1" max="100" writable="false" default="1" optional="true">SpeedMax</attribute>
+    <attribute side="server" code="0x0005" define="SPEED_SETTING" type="INT8U" min="0" max="100" writable="true" default="0" isNullable="true" optional="true">SpeedSetting</attribute>
+    <attribute side="server" code="0x0006" define="SPEED_CURRENT" type="INT8U" min="0" max="100" writable="false" default="0" optional="true">SpeedCurrent</attribute>
+    <attribute side="server" code="0x0007" define="ROCK_SUPPORT" type="BITMAP8" writable="false" default="0x00" optional="true">RockSupport</attribute>
+    <attribute side="server" code="0x0008" define="ROCK_SETTING" type="BITMAP8" writable="true" default="0x00" optional="true">RockSetting</attribute>
+    <attribute side="server" code="0x0009" define="WIND_SUPPORT" type="BITMAP8" writable="false" default="0x00" optional="true">WindSupport</attribute>
+    <attribute side="server" code="0x000A" define="WIND_SETTING" type="BITMAP8" writable="true" default="0x00" optional="true">WindSetting</attribute>
+  </cluster>
+</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml
new file mode 100644
index 00000000000000..4b0e758e367df8
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <domain name="Measurement &amp; Sensing"/>
+
+  <cluster>
+    <name>Occupancy Sensing</name>
+    <domain>Measurement &amp; Sensing</domain>
+    <description>Attributes and commands for configuring occupancy sensing, and reporting occupancy status.</description>
+    <code>0x0406</code>
+    <define>OCCUPANCY_SENSING_CLUSTER</define>
+
+    <client tick="false" init="false">true</client>
+    <server tick="false" tickFrequency="half" init="false">true</server>
+
+    <globalAttribute side="either" code="0xFFFD" value="3"/>
+
+    <attribute side="server" code="0x0000" define="OCCUPANCY" type="BITMAP8" min="0x00" max="0x01" writable="false" reportable="true" optional="false">Occupancy</attribute>
+    <attribute side="server" code="0x0001" define="OCCUPANCY_SENSOR_TYPE" type="ENUM8" min="0x00" max="0xFE" writable="false" optional="false">OccupancySensorType</attribute>
+    <attribute side="server" code="0x0002" define="OCCUPANCY_SENSOR_TYPE_BITMAP" type="BITMAP8" min="0x00" max="0x07" writable="false" optional="false">OccupancySensorTypeBitmap</attribute>
+
+    <attribute side="server" code="0x0010" define="PIR_OCCUPIED_TO_UNOCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
+      <description>PIROccupiedToUnoccupiedDelay</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+
+    <attribute side="server" code="0x0011" define="PIR_UNOCCUPIED_TO_OCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
+      <description>PIRUnoccupiedToOccupiedDelay</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+
+    <attribute side="server" code="0x0012" define="PIR_UNOCCUPIED_TO_OCCUPIED_THRESHOLD" type="INT8U" min="0x01" max="0xFE" writable="true" default="0x01" optional="true">
+      <description>PIRUnoccupiedToOccupiedThreshold</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+
+    <attribute side="server" code="0x0020" define="ULTRASONIC_OCCUPIED_TO_UNOCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
+      <description>UltrasonicOccupiedToUnoccupiedDelay</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+
+    <attribute side="server" code="0x0021" define="ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
+      <description>UltrasonicUnoccupiedToOccupiedDelay</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+
+    <attribute side="server" code="0x0022" define="ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_THRESHOLD" type="INT8U" min="0x01" max="0xFE" writable="true" default="0x01" optional="true">
+      <description>UltrasonicUnoccupiedToOccupiedThreshold</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+
+    <attribute side="server" code="0x0030" define="PHYSICAL_CONTACT_OCCUPIED_TO_UNOCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
+      <description>PhysicalContactOccupiedToUnoccupiedDelay</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+
+    <attribute side="server" code="0x0031" define="PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
+      <description>PhysicalContactUnoccupiedToOccupiedDelay</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+
+    <attribute side="server" code="0x0032" define="PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_THRESHOLD" type="INT8U" min="0x01" max="0xFE" writable="true" default="0x01" optional="true">
+      <description>PhysicalContactUnoccupiedToOccupiedThreshold</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+  </cluster>
+</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml
new file mode 100644
index 00000000000000..c3c054d7462ed9
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/thermostat-user-interface-configuration-cluster.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <domain name="HVAC"/>
+
+  <cluster>
+    <name>Thermostat User Interface Configuration</name>
+    <domain>HVAC</domain>
+    <description>An interface for configuring the user interface of a thermostat (which may be remote from the thermostat).</description>
+    <code>0x0204</code>
+    <define>THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER</define>
+
+    <client tick="false" init="false">true</client>
+    <server tick="false" tickFrequency="half" init="false">true</server>
+
+    <globalAttribute side="either" code="0xFFFD" value="2"/>
+
+    <attribute side="server" code="0x0000" define="TEMPERATURE_DISPLAY_MODE" type="ENUM8" min="0x00" max="0x01" writable="true" default="0x00" optional="false">TemperatureDisplayMode</attribute>
+
+    <attribute side="server" code="0x0001" define="KEYPAD_LOCKOUT" type="ENUM8" min="0x00" max="0x05" writable="true" default="0x00" optional="false">
+      <description>KeypadLockout</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+
+    <attribute side="server" code="0x0002" define="SCHEDULE_PROGRAMMING_VISIBILITY" type="ENUM8" min="0x00" max="0x01" writable="true" optional="true" introducedIn="ha-1.2-05-3520-29">
+      <description>ScheduleProgrammingVisibility</description>
+      <access op="read" role="view"/>
+      <access op="write" role="manage"/>
+    </attribute>
+  </cluster>
+</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/silabs/ha.xml b/src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml
similarity index 68%
rename from src/app/zap-templates/zcl/data-model/silabs/ha.xml
rename to src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml
index 96e38ca40b90a5..b1e8b72f0b2d13 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/ha.xml
+++ b/src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2008,2020 Silicon Labs.
+Copyright (c) 2023 Project CHIP Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,197 +15,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <configurator>
-  <domain name="Closures" spec="zcl-6.0-15-02018-001"/>
-  <domain name="HVAC" spec="zcl-6.0-15-02018-001"/>
-  <domain name="Lighting" spec="zcl6-errata-14-0129-15">
-    <older spec="zcl-6.0-15-02018-001" dependsOn="zcl-1.0-07-5123-03" certifiable="true"/>
-  </domain>
-  <domain name="Measurement &amp; Sensing" spec="zcl-6.0-15-02018-001"/>
-  <domain name="Security &amp; Safety" spec="zcl-6.0-15-02018-001"/>
-  <domain name="HA" spec="ha-1.2.1-05-3520-30" dependsOn="zcl-1.0-07-5123-03" certifiable="true">
-    <older spec="ha-1.2-05-3520-29" dependsOn="zcl-1.0-07-5123-03" certifiable="true"/>
-    <older spec="ha-1.1-05-3520-27" dependsOn="zcl-1.0-07-5123-03" certifiable="true"/>
-  </domain>
-  <cluster>
-    <name>Fan Control</name>
-    <domain>HVAC</domain>
-    <description>An interface for controlling a fan in a heating/cooling system.</description>
-    <code>0x0202</code>
-    <define>FAN_CONTROL_CLUSTER</define>
-    <client tick="false" init="false">true</client>
-    <server tick="false" init="false">true</server>
-    <attribute side="server" code="0x0000" define="FAN_MODE" type="FanModeType" min="0" max="6" writable="true" default="0" optional="false">FanMode</attribute>
-    <attribute side="server" code="0x0001" define="FAN_MODE_SEQUENCE" type="FanModeSequenceType" min="0" max="5" writable="true" default="2" optional="false">FanModeSequence</attribute>
-    <attribute side="server" code="0x0002" define="PERCENT_SETTING" type="INT8U" min="0" max="100" writable="true" default="0" isNullable="true" optional="false">PercentSetting</attribute>
-    <attribute side="server" code="0x0003" define="PERCENT_CURRENT" type="INT8U" min="0" max="100" writable="false" default="0" optional="false">PercentCurrent</attribute>
-    <attribute side="server" code="0x0004" define="SPEED_MAX" type="INT8U" min="1" max="100" writable="false" default="1" optional="true">SpeedMax</attribute>
-    <attribute side="server" code="0x0005" define="SPEED_SETTING" type="INT8U" min="0" max="100" writable="true" default="0" isNullable="true" optional="true">SpeedSetting</attribute>
-    <attribute side="server" code="0x0006" define="SPEED_CURRENT" type="INT8U" min="0" max="100" writable="false" default="0" optional="true">SpeedCurrent</attribute>
-    <attribute side="server" code="0x0007" define="ROCK_SUPPORT" type="BITMAP8" writable="false" default="0x00" optional="true">RockSupport</attribute>
-    <attribute side="server" code="0x0008" define="ROCK_SETTING" type="BITMAP8" writable="true" default="0x00" optional="true">RockSetting</attribute>
-    <attribute side="server" code="0x0009" define="WIND_SUPPORT" type="BITMAP8" writable="false" default="0x00" optional="true">WindSupport</attribute>
-    <attribute side="server" code="0x000A" define="WIND_SETTING" type="BITMAP8" writable="true" default="0x00" optional="true">WindSetting</attribute>
-  </cluster>
-  <!-- Fan Control Cluster data types -->
-  <enum name="FanModeType" type="ENUM8">
-    <cluster code="0x0202"/>
-    <item name="Off" value="0x00"/>
-    <item name="Low" value="0x01"/>
-    <item name="Medium" value="0x02"/>
-    <item name="High" value="0x03"/>
-    <item name="On" value="0x04"/>
-    <item name="Auto" value="0x05"/>
-    <item name="Smart" value="0x06"/>
-  </enum>
-  <enum name="FanModeSequenceType" type="ENUM8">
-    <cluster code="0x0202"/>
-    <item name="Off/Low/Med/High" value="0x00"/>
-    <item name="Off/Low/High" value="0x01"/>
-    <item name="Off/Low/Med/High/Auto" value="0x02"/>
-    <item name="Off/Low/High/Auto" value="0x03"/>
-    <item name="Off/On/Auto" value="0x04"/>
-    <item name="Off/On" value="0x05"/>
-  </enum>
-  <bitmap name="FanControlFeature" type="BITMAP32">
-    <cluster code="0x0202" />
-    <field name="Multi-Speed" mask="0x01" />
-    <field name="Auto" mask="0x02" />
-    <field name="Rocking" mask="0x04" />
-    <field name="Wind" mask="0x08" />
-  </bitmap>
-  <bitmap name="RockSupportMask" type="BITMAP8">
-    <cluster code="0x0202" />
-    <field name="RockLeftRight" mask="0x01" />
-    <field name="RockUpDown" mask="0x02" />
-    <field name="RockRound" mask="0x04" />
-  </bitmap>
-  <bitmap name="WindSupportMask" type="BITMAP8">
-    <cluster code="0x0202" />
-    <field name="Sleep Wind" mask="0x01" />
-    <field name="Natural Wind" mask="0x02" />
-  </bitmap>
-  <bitmap name="WindSettingMask" type="BITMAP8">
-    <cluster code="0x0202" />
-    <field name="Sleep Wind" mask="0x01" />
-    <field name="Natural Wind" mask="0x02" />
-  </bitmap>
-  <cluster>
-    <name>Thermostat User Interface Configuration</name>
-    <domain>HVAC</domain>
-    <description>An interface for configuring the user interface of a thermostat (which may be remote from the thermostat).</description>
-    <code>0x0204</code>
-    <define>THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER</define>
-    <client tick="false" init="false">true</client>
-    <server tick="false" tickFrequency="half" init="false">true</server>
-    <globalAttribute side="either" code="0xFFFD" value="2"/>
-    <attribute side="server" code="0x0000" define="TEMPERATURE_DISPLAY_MODE" type="ENUM8" min="0x00" max="0x01" writable="true" default="0x00" optional="false">TemperatureDisplayMode</attribute>
-    <attribute side="server" code="0x0001" define="KEYPAD_LOCKOUT" type="ENUM8" min="0x00" max="0x05" writable="true" default="0x00" optional="false">
-      <description>KeypadLockout</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <attribute side="server" code="0x0002" define="SCHEDULE_PROGRAMMING_VISIBILITY" type="ENUM8" min="0x00" max="0x01" writable="true" optional="true" introducedIn="ha-1.2-05-3520-29">
-      <description>ScheduleProgrammingVisibility</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-  </cluster>
-  <cluster>
-    <name>Ballast Configuration</name>
-    <domain>Lighting</domain>
-    <description>Attributes and commands for configuring a lighting ballast.</description>
-    <code>0x0301</code>
-    <define>BALLAST_CONFIGURATION_CLUSTER</define>
-    <client tick="false" init="false">true</client>
-    <server tick="false" init="false">true</server>
-    <globalAttribute side="either" code="0xFFFD" value="4"/>
-    <!-- Ballast Configuration Attribute Set -->
-    <attribute side="server" code="0x0000" define="PHYSICAL_MIN_LEVEL" type="INT8U" min="0x01" max="0xFE" writable="false" default="0x01" optional="false">PhysicalMinLevel</attribute>
-    <attribute side="server" code="0x0001" define="PHYSICAL_MAX_LEVEL" type="INT8U" min="0x01" max="0xFE" writable="false" default="0xFE" optional="false">PhysicalMaxLevel</attribute>
-    <attribute side="server" code="0x0002" define="BALLAST_STATUS" type="BITMAP8" min="0x00" max="0x03" writable="false" default="0x00" optional="true">BallastStatus</attribute>
-    <!-- Ballast Settings Attribute Set -->
-    <attribute side="server" code="0x0010" define="MIN_LEVEL" type="INT8U" min="0x01" max="0xFE" writable="true" default="0x01" optional="false">MinLevel</attribute>
-    <attribute side="server" code="0x0011" define="MAX_LEVEL" type="INT8U" min="0x01" max="0xFE" writable="true" default="0xFE" optional="false">MaxLevel</attribute>
-    <!-- PowerOnLevel and PowerOnFadeTime are deprecated -->
-    <attribute side="server" code="0x0014" define="INTRINSIC_BALLAST_FACTOR" type="INT8U" writable="true" isNullable="true" optional="true">IntrinsicBallastFactor</attribute>
-    <attribute side="server" code="0x0015" define="BALLAST_FACTOR_ADJUSTMENT" type="INT8U" min="0x64" writable="true" default="0xFF" isNullable="true" optional="true">BallastFactorAdjustment</attribute>
-    <!-- Lamp Information Attribute Set -->
-    <attribute side="server" code="0x0020" define="LAMP_QUANTITY" type="INT8U" writable="false" optional="false">LampQuantity</attribute>
-    <!-- Lamp Settings Attribute Set -->
-    <attribute side="server" code="0x0030" define="LAMP_TYPE" type="CHAR_STRING" length="16" writable="true" optional="true">LampType</attribute>
-    <attribute side="server" code="0x0031" define="LAMP_MANUFACTURER" type="CHAR_STRING" length="16" writable="true" optional="true">LampManufacturer</attribute>
-    <attribute side="server" code="0x0032" define="LAMP_RATED_HOURS" type="INT24U" writable="true" default="0xFFFFFF" isNullable="true" optional="true">LampRatedHours</attribute>
-    <attribute side="server" code="0x0033" define="LAMP_BURN_HOURS" type="INT24U" writable="true" default="0x000000" isNullable="true" optional="true">LampBurnHours</attribute>
-    <attribute side="server" code="0x0034" define="LAMP_ALARM_MODE" type="BITMAP8" min="0x00" max="0x01" writable="true" default="0x00" optional="true">LampAlarmMode</attribute>
-    <attribute side="server" code="0x0035" define="LAMP_BURN_HOURS_TRIP_POINT" type="INT24U" writable="true" default="0xFFFFFF" isNullable="true" optional="true">LampBurnHoursTripPoint</attribute>
-  </cluster>
-  <cluster>
-    <name>Occupancy Sensing</name>
-    <domain>Measurement &amp; Sensing</domain>
-    <description>Attributes and commands for configuring occupancy sensing, and reporting occupancy status.</description>
-    <code>0x0406</code>
-    <define>OCCUPANCY_SENSING_CLUSTER</define>
-    <client tick="false" init="false">true</client>
-    <server tick="false" tickFrequency="half" init="false">true</server>
-    <globalAttribute side="either" code="0xFFFD" value="3"/>
-    <attribute side="server" code="0x0000" define="OCCUPANCY" type="BITMAP8" min="0x00" max="0x01" writable="false" reportable="true" optional="false">Occupancy</attribute>
-    <attribute side="server" code="0x0001" define="OCCUPANCY_SENSOR_TYPE" type="ENUM8" min="0x00" max="0xFE" writable="false" optional="false">OccupancySensorType</attribute>
-    <attribute side="server" code="0x0002" define="OCCUPANCY_SENSOR_TYPE_BITMAP" type="BITMAP8" min="0x00" max="0x07" writable="false" optional="false">OccupancySensorTypeBitmap</attribute>
-    <attribute side="server" code="0x0010" define="PIR_OCCUPIED_TO_UNOCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
-      <description>PIROccupiedToUnoccupiedDelay</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <attribute side="server" code="0x0011" define="PIR_UNOCCUPIED_TO_OCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
-      <description>PIRUnoccupiedToOccupiedDelay</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <attribute side="server" code="0x0012" define="PIR_UNOCCUPIED_TO_OCCUPIED_THRESHOLD" type="INT8U" min="0x01" max="0xFE" writable="true" default="0x01" optional="true">
-      <description>PIRUnoccupiedToOccupiedThreshold</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <attribute side="server" code="0x0020" define="ULTRASONIC_OCCUPIED_TO_UNOCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
-      <description>UltrasonicOccupiedToUnoccupiedDelay</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <attribute side="server" code="0x0021" define="ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
-      <description>UltrasonicUnoccupiedToOccupiedDelay</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <attribute side="server" code="0x0022" define="ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_THRESHOLD" type="INT8U" min="0x01" max="0xFE" writable="true" default="0x01" optional="true">
-      <description>UltrasonicUnoccupiedToOccupiedThreshold</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <attribute side="server" code="0x0030" define="PHYSICAL_CONTACT_OCCUPIED_TO_UNOCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
-      <description>PhysicalContactOccupiedToUnoccupiedDelay</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <attribute side="server" code="0x0031" define="PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
-      <description>PhysicalContactUnoccupiedToOccupiedDelay</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-    <attribute side="server" code="0x0032" define="PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_THRESHOLD" type="INT8U" min="0x01" max="0xFE" writable="true" default="0x01" optional="true">
-      <description>PhysicalContactUnoccupiedToOccupiedThreshold</description>
-      <access op="read" role="view"/>
-      <access op="write" role="manage"/>
-    </attribute>
-  </cluster>
+  <domain name="Home Automation"/>
+
   <cluster introducedIn="ha-1.2-05-3520-29">
     <name>Electrical Measurement</name>
     <domain>Home Automation</domain>
     <description>Attributes related to the electrical properties of a device. This cluster is used by power outlets and other devices that need to provide instantaneous data as opposed to metrology data which should be retrieved from the metering cluster..</description>
     <code>0x0B04</code>
     <define>ELECTRICAL_MEASUREMENT_CLUSTER</define>
+
     <client init="false" tick="false">true</client>
     <server init="false" tick="false">true</server>
+
     <globalAttribute side="either" code="0xFFFD" value="3"/>
+
     <attribute side="server" code="0x0000" define="MEASUREMENT_TYPE" type="BITMAP32" min="0x00000000" max="0xFFFFFFFF" writable="false" default="0x000000" optional="true">measurement type</attribute>
     <attribute side="server" code="0x0100" define="DC_VOLTAGE" type="INT16S" min="-32768" max="32767" writable="false" default="0x8000" optional="true">dc voltage</attribute>
     <attribute side="server" code="0x0101" define="DC_VOLTAGE_MIN" type="INT16S" min="-32768" max="32767" writable="false" default="0x8000" optional="true">dc voltage min</attribute>
@@ -334,6 +157,7 @@ limitations under the License.
     <attribute side="server" code="0x0A15" define="RMS_EXTREME_UNDER_VOLTAGE_PERIOD_PHASE_C" type="INT16U" min="0x0000" max="0xffff" writable="false" default="0x0000" optional="true">rms extreme under voltage period phase c</attribute>
     <attribute side="server" code="0x0A16" define="RMS_VOLTAGE_SAG_PERIOD_PHASE_C" type="INT16U" min="0x0000" max="0xffff" writable="false" default="0x0000" optional="true">rms voltage sag period phase c</attribute>
     <attribute side="server" code="0x0A17" define="RMS_VOLTAGE_SWELL_PERIOD_PHASE_C" type="INT16U" min="0x0000" max="0xffff" writable="false" default="0x0000" optional="true">rms voltage swell period phase c</attribute>
+
     <command source="server" code="0x00" name="GetProfileInfoResponseCommand" optional="true" disableDefaultResponse="true">
       <description>
         A function which returns the power profiling information requested in the GetProfileInfo command. The power profiling information consists of a list of attributes which are profiled along with the period used to profile them.
@@ -343,6 +167,7 @@ limitations under the License.
       <arg name="maxNumberOfIntervals" type="INT8U"/>
       <arg name="listOfAttributes" type="INT16U" array="true"/>
     </command>
+
     <command source="server" code="0x01" name="GetMeasurementProfileResponseCommand" optional="true" disableDefaultResponse="true">
       <description>
         A function which returns the electricity measurement profile. The electricity measurement profile includes information regarding the amount of time used to capture data related to the flow of electricity as well as the intervals thes
@@ -354,11 +179,13 @@ limitations under the License.
       <arg name="attributeId" type="INT16U"/>
       <arg name="intervals" type="INT8U" array="true"/>
     </command>
+
     <command source="client" code="0x00" name="GetProfileInfoCommand" optional="true">
       <description>
         A function which retrieves the power profiling information from the electrical measurement server.
       </description>
     </command>
+
     <command source="client" code="0x01" name="GetMeasurementProfileCommand" optional="true">
       <description>
         A function which retrieves an electricity measurement profile from the electricity measurement server for a specific attribute Id requested.
diff --git a/src/app/zap-templates/zcl/data-model/draft/types/ballast-configuration.xml b/src/app/zap-templates/zcl/data-model/draft/types/ballast-configuration.xml
new file mode 100644
index 00000000000000..bf9a38ab833517
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/draft/types/ballast-configuration.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <bitmap name="BallastStatus" type="BITMAP8">
+    <field name="NonOperational" mask="0x1"/>
+    <field name="LampNotInSocket" mask="0x2"/>
+  </bitmap>
+
+  <bitmap name="LampAlarmMode" type="BITMAP8">
+    <field name="lampBurnHours" mask="0x1"/>
+  </bitmap>
+</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/draft/types/occupancy-sensing.xml b/src/app/zap-templates/zcl/data-model/draft/types/occupancy-sensing.xml
new file mode 100644
index 00000000000000..94478a8d5f96c7
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/draft/types/occupancy-sensing.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <bitmap name="Occupancy" type="BITMAP8">
+    <field name="occupied" mask="0x1"/>
+  </bitmap>
+
+  <enum name="OccupancySensorType" type="ENUM8">
+    <item name="PIR" value="0x0"/>
+    <item name="Ultrasonic" value="0x1"/>
+    <item name="pirAndUltrasonic" value="0x2"/>
+    <item name="physicalContact" value="0x3"/>
+  </enum>
+
+  <bitmap name="OccupancySensorTypeBitmap" type="BITMAP8">
+    <field name="Pir" mask="0x01"/>
+    <field name="Ultrasonic" mask="0x02"/>
+    <field name="PhysicalContact" mask="0x04"/>
+  </bitmap>
+</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/draft/types/thermostat-user-interface-configuration.xml b/src/app/zap-templates/zcl/data-model/draft/types/thermostat-user-interface-configuration.xml
new file mode 100644
index 00000000000000..cedbdcc1585094
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/draft/types/thermostat-user-interface-configuration.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2023 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <enum name="TemperatureDisplayMode" type="ENUM8">
+    <item name="celsius" value="0x0"/>
+    <item name="fahrenheit" value="0x1"/>
+  </enum>
+
+  <enum name="KeypadLockout" type="ENUM8">
+    <item name="noLockout" value="0x0"/>
+    <item name="levelOneLockout" value="0x1"/>
+    <item name="levelTwoLockout" value="0x2"/>
+    <item name="levelThreeLockout" value="0x3"/>
+    <item name="levelFourLockout" value="0x4"/>
+    <item name="levelfiveLockout" value="0x5"/>
+  </enum>
+</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml b/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml
index 0594d6a8f3e13d..10b1e35686fca3 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml
+++ b/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml
@@ -43,16 +43,6 @@ limitations under the License.
     <field name="MasterZoneDst" mask="0x4"/>
     <field name="Superseding" mask="0x8"/>
   </bitmap>
-  <bitmap name="BallastStatus" type="BITMAP8">
-    <field name="NonOperational" mask="0x1"/>
-    <field name="LampNotInSocket" mask="0x2"/>
-  </bitmap>
-  <bitmap name="LampAlarmMode" type="BITMAP8">
-    <field name="lampBurnHours" mask="0x1"/>
-  </bitmap>
-  <bitmap name="Occupancy" type="BITMAP8">
-    <field name="occupied" mask="0x1"/>
-  </bitmap>
   <bitmap name="IasZoneStatus" type="BITMAP16">
     <cluster code="0x0500"/>
     <cluster code="0x0501"/>
@@ -119,22 +109,6 @@ limitations under the License.
     <item name="Off" value="0x1"/>
     <item name="Toggle" value="0x2"/>
   </enum>
-  <enum name="FanMode" type="ENUM8">
-    <item name="off" value="0x0"/>
-    <item name="low" value="0x1"/>
-    <item name="medium" value="0x2"/>
-    <item name="high" value="0x3"/>
-    <item name="on" value="0x4"/>
-    <item name="auto" value="0x5"/>
-    <item name="smart" value="0x6"/>
-  </enum>
-  <enum name="FanModeSequence" type="ENUM8">
-    <item name="LowMedHigh" value="0x0"/>
-    <item name="lowHigh" value="0x1"/>
-    <item name="LowMedHighAuto" value="0x2"/>
-    <item name="lowHighAuto" value="0x3"/>
-    <item name="onAuto" value="0x4"/>
-  </enum>
   <enum name="RelativeHumidityMode" type="ENUM8">
     <item name="measureLocally" value="0x0"/>
     <item name="updatedOverTheNetwork" value="0x1"/>
@@ -147,34 +121,11 @@ limitations under the License.
     <item name="notDisplayed" value="0x0"/>
     <item name="displayed" value="0x1"/>
   </enum>
-  <enum name="TemperatureDisplayMode" type="ENUM8">
-    <item name="celsius" value="0x0"/>
-    <item name="fahrenheit" value="0x1"/>
-  </enum>
-  <enum name="KeypadLockout" type="ENUM8">
-    <item name="noLockout" value="0x0"/>
-    <item name="levelOneLockout" value="0x1"/>
-    <item name="levelTwoLockout" value="0x2"/>
-    <item name="levelThreeLockout" value="0x3"/>
-    <item name="levelFourLockout" value="0x4"/>
-    <item name="levelfiveLockout" value="0x5"/>
-  </enum>
   <enum name="LevelStatus" type="ENUM8">
     <item name="OnTarget" value="0x0"/>
     <item name="BelowTarget" value="0x1"/>
     <item name="AboveTarget" value="0x2"/>
   </enum>
-  <enum name="OccupancySensorType" type="ENUM8">
-    <item name="PIR" value="0x0"/>
-    <item name="Ultrasonic" value="0x1"/>
-    <item name="pirAndUltrasonic" value="0x2"/>
-    <item name="physicalContact" value="0x3"/>
-  </enum>
-  <bitmap name="OccupancySensorTypeBitmap" type="BITMAP8">
-    <field name="Pir" mask="0x01"/>
-    <field name="Ultrasonic" mask="0x02"/>
-    <field name="PhysicalContact" mask="0x04"/>
-  </bitmap>
   <enum name="WarningMode" type="ENUM8">
     <item name="stop" value="0x0"/>
     <item name="burglar" value="0x1"/>
diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
index 13c9f2ad6ed45a..27c798c91a1b94 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -20,6 +20,7 @@
         "application-basic-cluster.xml",
         "application-launcher-cluster.xml",
         "audio-output-cluster.xml",
+        "ballast-configuration-cluster.xml",
         "barrier-control-cluster.xml",
         "basic-information-cluster.xml",
         "binding-cluster.xml",
@@ -35,7 +36,9 @@
         "descriptor-cluster.xml",
         "diagnostic-logs-cluster.xml",
         "door-lock-cluster.xml",
+        "electrical-measurement-cluster.xml",
         "ethernet-network-diagnostics-cluster.xml",
+        "fan-control-cluster.xml",
         "fault-injection-cluster.xml",
         "fixed-label-cluster.xml",
         "flow-measurement-cluster.xml",
@@ -56,6 +59,7 @@
         "mode-select-cluster.xml",
         "mode-select-extensions.xml",
         "network-commissioning-cluster.xml",
+        "occupancy-sensing-cluster.xml",
         "onoff-cluster.xml",
         "onoff-switch-configuration-cluster.xml",
         "operational-credentials-cluster.xml",
@@ -75,6 +79,7 @@
         "temperature-measurement-cluster.xml",
         "test-cluster.xml",
         "thermostat-cluster.xml",
+        "thermostat-user-interface-configuration-cluster.xml",
         "thread-network-diagnostics-cluster.xml",
         "time-format-localization-cluster.xml",
         "time-synchronization-cluster.xml",
@@ -85,10 +90,11 @@
         "window-covering.xml",
         "matter-devices.xml",
         "ha-devices.xml",
-        "ha.xml",
         "lo-devices.xml",
         "zll-devices.xml",
-        "types/color-control.xml"
+        "types/color-control.xml",
+        "types/occupancy-sensing.xml",
+        "types/thermostat-user-interface-configuration.xml"
     ],
     "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
     "options": {
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index 509e41fb7f9aee..41d08dc3c3afba 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -19,6 +19,7 @@
         "application-basic-cluster.xml",
         "application-launcher-cluster.xml",
         "audio-output-cluster.xml",
+        "ballast-configuration-cluster.xml",
         "barrier-control-cluster.xml",
         "basic-information-cluster.xml",
         "binding-cluster.xml",
@@ -34,7 +35,9 @@
         "descriptor-cluster.xml",
         "diagnostic-logs-cluster.xml",
         "door-lock-cluster.xml",
+        "electrical-measurement-cluster.xml",
         "ethernet-network-diagnostics-cluster.xml",
+        "fan-control-cluster.xml",
         "fault-injection-cluster.xml",
         "fixed-label-cluster.xml",
         "flow-measurement-cluster.xml",
@@ -54,6 +57,7 @@
         "media-playback-cluster.xml",
         "mode-select-cluster.xml",
         "network-commissioning-cluster.xml",
+        "occupancy-sensing-cluster.xml",
         "onoff-cluster.xml",
         "onoff-switch-configuration-cluster.xml",
         "operational-credentials-cluster.xml",
@@ -73,6 +77,7 @@
         "temperature-measurement-cluster.xml",
         "test-cluster.xml",
         "thermostat-cluster.xml",
+        "thermostat-user-interface-configuration-cluster.xml",
         "thread-network-diagnostics-cluster.xml",
         "time-format-localization-cluster.xml",
         "time-synchronization-cluster.xml",
@@ -83,10 +88,11 @@
         "window-covering.xml",
         "matter-devices.xml",
         "ha-devices.xml",
-        "ha.xml",
         "lo-devices.xml",
         "zll-devices.xml",
-        "types/color-control.xml"
+        "types/color-control.xml",
+        "types/occupancy-sensing.xml",
+        "types/thermostat-user-interface-configuration.xml"
     ],
     "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
     "options": {
diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h
index f83ba8513ca2ee..d8c3a44aec3801 100644
--- a/zzz_generated/app-common/app-common/zap-generated/enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/enums.h
@@ -330,10 +330,6 @@ enum EmberAfWiFiVersionType : uint8_t
 #define EMBER_AF_APPLICATION_LAUNCHER_FEATURE_APPLICATION_PLATFORM_OFFSET (0)
 #define EMBER_AF_AUDIO_OUTPUT_FEATURE_NAME_UPDATES (1)
 #define EMBER_AF_AUDIO_OUTPUT_FEATURE_NAME_UPDATES_OFFSET (0)
-#define EMBER_AF_BALLAST_STATUS_NON_OPERATIONAL (1)
-#define EMBER_AF_BALLAST_STATUS_NON_OPERATIONAL_OFFSET (0)
-#define EMBER_AF_BALLAST_STATUS_LAMP_NOT_IN_SOCKET (2)
-#define EMBER_AF_BALLAST_STATUS_LAMP_NOT_IN_SOCKET_OFFSET (1)
 #define EMBER_AF_BARRIER_CONTROL_CAPABILITIES_PARTIAL_BARRIER (1)
 #define EMBER_AF_BARRIER_CONTROL_CAPABILITIES_PARTIAL_BARRIER_OFFSET (0)
 #define EMBER_AF_BARRIER_CONTROL_SAFETY_STATUS_REMOTE_LOCKOUT (1)
@@ -718,8 +714,6 @@ enum EmberAfWiFiVersionType : uint8_t
 #define EMBER_AF_KEYPAD_INPUT_FEATURE_LOCATION_KEYS_OFFSET (1)
 #define EMBER_AF_KEYPAD_INPUT_FEATURE_NUMBER_KEYS (4)
 #define EMBER_AF_KEYPAD_INPUT_FEATURE_NUMBER_KEYS_OFFSET (2)
-#define EMBER_AF_LAMP_ALARM_MODE_LAMP_BURN_HOURS (1)
-#define EMBER_AF_LAMP_ALARM_MODE_LAMP_BURN_HOURS_OFFSET (0)
 #define EMBER_AF_LEVEL_CONTROL_FEATURE_ON_OFF (1)
 #define EMBER_AF_LEVEL_CONTROL_FEATURE_ON_OFF_OFFSET (0)
 #define EMBER_AF_LEVEL_CONTROL_FEATURE_LIGHTING (2)