diff --git a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml
index f788d3b280a3b3..39ae4188a84df6 100644
--- a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml
@@ -27,32 +27,6 @@ limitations under the License.
     <field name="AutoMode" mask="0x20"/>
   </bitmap>
 
-  <bitmap name="ThermostatOccupancy" type="BITMAP8">
-    <field name="occupied" mask="0x1"/>
-  </bitmap>
-
-  <bitmap name="ThermostatSensing" type="BITMAP8">
-    <field name="localTempSensedRemotely" mask="0x1"/>
-    <field name="outdoorTempSensedRemotely" mask="0x2"/>
-    <field name="occupancySensedRemotely" mask="0x4"/>
-  </bitmap>
-
-  <bitmap name="ThermostatAlarmMask" type="BITMAP8">
-    <field name="initializationFailure" mask="0x1"/>
-    <field name="hardwareFailure" mask="0x2"/>
-    <field name="selfcalibrationFailure" mask="0x4"/>
-  </bitmap>
-
-  <bitmap name="ThermostatRunningState" type="BITMAP16">
-    <field name="HeatStateOn" mask="0x0001"/>
-    <field name="CoolStateOn" mask="0x0002"/>
-    <field name="FanStateOn" mask="0x0004"/>
-    <field name="HeatSecondStageStateOn" mask="0x0008"/>
-    <field name="CoolSecondStageStateOn" mask="0x0010"/>
-    <field name="FanSecondStageStateOn" mask="0x0020"/>
-    <field name="FanThirdStageStateOn" mask="0x0040"/>
-  </bitmap>
-
   <bitmap name="DayOfWeek" type="BITMAP8">
     <cluster code="0x0201"/>
     <field name="Sunday" mask="0x01"/>
diff --git a/src/app/zap-templates/zcl/data-model/draft/README.md b/src/app/zap-templates/zcl/data-model/draft/README.md
new file mode 100644
index 00000000000000..06d7e77df709e3
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/draft/README.md
@@ -0,0 +1,8 @@
+# Data Model Draft
+
+### What is this repo?
+
+This directory contains clusters and types that have not been specified yet.
+
+**IMPORTANT**: Adding a cluster code to the types in this folder will expose
+them as if they are fully specified.
diff --git a/src/app/zap-templates/zcl/data-model/draft/types/thermostat.xml b/src/app/zap-templates/zcl/data-model/draft/types/thermostat.xml
new file mode 100644
index 00000000000000..a1b7e71cc1fdfa
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/draft/types/thermostat.xml
@@ -0,0 +1,43 @@
+<?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="ThermostatOccupancy" type="BITMAP8">
+    <field name="occupied" mask="0x1"/>
+  </bitmap>
+
+  <bitmap name="ThermostatSensing" type="BITMAP8">
+    <field name="localTempSensedRemotely" mask="0x1"/>
+    <field name="outdoorTempSensedRemotely" mask="0x2"/>
+    <field name="occupancySensedRemotely" mask="0x4"/>
+  </bitmap>
+
+  <bitmap name="ThermostatAlarmMask" type="BITMAP8">
+    <field name="initializationFailure" mask="0x1"/>
+    <field name="hardwareFailure" mask="0x2"/>
+    <field name="selfcalibrationFailure" mask="0x4"/>
+  </bitmap>
+
+  <bitmap name="ThermostatRunningState" type="BITMAP16">
+    <field name="HeatStateOn" mask="0x0001"/>
+    <field name="CoolStateOn" mask="0x0002"/>
+    <field name="FanStateOn" mask="0x0004"/>
+    <field name="HeatSecondStageStateOn" mask="0x0008"/>
+    <field name="CoolSecondStageStateOn" mask="0x0010"/>
+    <field name="FanSecondStageStateOn" mask="0x0020"/>
+    <field name="FanThirdStageStateOn" mask="0x0040"/>
+  </bitmap>
+</configurator>
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 daf55b0963e8a7..f83ba8513ca2ee 100644
--- a/zzz_generated/app-common/app-common/zap-generated/enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/enums.h
@@ -898,12 +898,6 @@ enum EmberAfWiFiVersionType : uint8_t
 #define EMBER_AF_SWITCH_FEATURE_MOMENTARY_SWITCH_LONG_PRESS_OFFSET (3)
 #define EMBER_AF_SWITCH_FEATURE_MOMENTARY_SWITCH_MULTI_PRESS (16)
 #define EMBER_AF_SWITCH_FEATURE_MOMENTARY_SWITCH_MULTI_PRESS_OFFSET (4)
-#define EMBER_AF_THERMOSTAT_ALARM_MASK_INITIALIZATION_FAILURE (1)
-#define EMBER_AF_THERMOSTAT_ALARM_MASK_INITIALIZATION_FAILURE_OFFSET (0)
-#define EMBER_AF_THERMOSTAT_ALARM_MASK_HARDWARE_FAILURE (2)
-#define EMBER_AF_THERMOSTAT_ALARM_MASK_HARDWARE_FAILURE_OFFSET (1)
-#define EMBER_AF_THERMOSTAT_ALARM_MASK_SELFCALIBRATION_FAILURE (4)
-#define EMBER_AF_THERMOSTAT_ALARM_MASK_SELFCALIBRATION_FAILURE_OFFSET (2)
 #define EMBER_AF_THERMOSTAT_FEATURE_HEATING (1)
 #define EMBER_AF_THERMOSTAT_FEATURE_HEATING_OFFSET (0)
 #define EMBER_AF_THERMOSTAT_FEATURE_COOLING (2)
@@ -916,28 +910,6 @@ enum EmberAfWiFiVersionType : uint8_t
 #define EMBER_AF_THERMOSTAT_FEATURE_SETBACK_OFFSET (4)
 #define EMBER_AF_THERMOSTAT_FEATURE_AUTO_MODE (32)
 #define EMBER_AF_THERMOSTAT_FEATURE_AUTO_MODE_OFFSET (5)
-#define EMBER_AF_THERMOSTAT_OCCUPANCY_OCCUPIED (1)
-#define EMBER_AF_THERMOSTAT_OCCUPANCY_OCCUPIED_OFFSET (0)
-#define EMBER_AF_THERMOSTAT_RUNNING_STATE_HEAT_STATE_ON (1)
-#define EMBER_AF_THERMOSTAT_RUNNING_STATE_HEAT_STATE_ON_OFFSET (0)
-#define EMBER_AF_THERMOSTAT_RUNNING_STATE_COOL_STATE_ON (2)
-#define EMBER_AF_THERMOSTAT_RUNNING_STATE_COOL_STATE_ON_OFFSET (1)
-#define EMBER_AF_THERMOSTAT_RUNNING_STATE_FAN_STATE_ON (4)
-#define EMBER_AF_THERMOSTAT_RUNNING_STATE_FAN_STATE_ON_OFFSET (2)
-#define EMBER_AF_THERMOSTAT_RUNNING_STATE_HEAT_SECOND_STAGE_STATE_ON (8)
-#define EMBER_AF_THERMOSTAT_RUNNING_STATE_HEAT_SECOND_STAGE_STATE_ON_OFFSET (3)
-#define EMBER_AF_THERMOSTAT_RUNNING_STATE_COOL_SECOND_STAGE_STATE_ON (16)
-#define EMBER_AF_THERMOSTAT_RUNNING_STATE_COOL_SECOND_STAGE_STATE_ON_OFFSET (4)
-#define EMBER_AF_THERMOSTAT_RUNNING_STATE_FAN_SECOND_STAGE_STATE_ON (32)
-#define EMBER_AF_THERMOSTAT_RUNNING_STATE_FAN_SECOND_STAGE_STATE_ON_OFFSET (5)
-#define EMBER_AF_THERMOSTAT_RUNNING_STATE_FAN_THIRD_STAGE_STATE_ON (64)
-#define EMBER_AF_THERMOSTAT_RUNNING_STATE_FAN_THIRD_STAGE_STATE_ON_OFFSET (6)
-#define EMBER_AF_THERMOSTAT_SENSING_LOCAL_TEMP_SENSED_REMOTELY (1)
-#define EMBER_AF_THERMOSTAT_SENSING_LOCAL_TEMP_SENSED_REMOTELY_OFFSET (0)
-#define EMBER_AF_THERMOSTAT_SENSING_OUTDOOR_TEMP_SENSED_REMOTELY (2)
-#define EMBER_AF_THERMOSTAT_SENSING_OUTDOOR_TEMP_SENSED_REMOTELY_OFFSET (1)
-#define EMBER_AF_THERMOSTAT_SENSING_OCCUPANCY_SENSED_REMOTELY (4)
-#define EMBER_AF_THERMOSTAT_SENSING_OCCUPANCY_SENSED_REMOTELY_OFFSET (2)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_FEATURE_PACKET_COUNTS (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_FEATURE_PACKET_COUNTS_OFFSET (0)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_FEATURE_ERROR_COUNTS (2)