diff --git a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml
index 93e038eb8952bd..33c34f855a9994 100644
--- a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml
@@ -757,4 +757,71 @@ limitations under the License.
         <field name="Year Day Access Schedules" mask="0x400" />
         <field name="Holiday Schedules" mask="0x800" />
     </bitmap>
+
+    <enum name="DoorLockSetPinOrIdStatus" type="ENUM8">
+        <cluster code="0x0101"/>
+        <item name="Success" value="0x00"/>
+        <item name="GeneralFailure" value="0x01"/>
+        <item name="MemoryFull" value="0x02"/>
+        <item name="DuplicateCodeError" value="0x03"/>
+    </enum>
+
+    <enum name="DoorLockOperationEventCode" type="ENUM8">
+        <cluster code="0x0101"/>
+        <item name="UnknownOrMfgSpecific" value="0x00"/>
+        <item name="Lock" value="0x01"/>
+        <item name="Unlock" value="0x02"/>
+        <item name="LockInvalidPinOrId" value="0x03"/>
+        <item name="LockInvalidSchedule" value="0x04"/>
+        <item name="UnlockInvalidPinOrId" value="0x05"/>
+        <item name="UnlockInvalidSchedule" value="0x06"/>
+        <item name="OneTouchLock" value="0x07"/>
+        <item name="KeyLock" value="0x08"/>
+        <item name="KeyUnlock" value="0x09"/>
+        <item name="AutoLock" value="0x0A"/>
+        <item name="ScheduleLock" value="0x0B"/>
+        <item name="ScheduleUnlock" value="0x0C"/>
+        <item name="ManualLock" value="0x0D"/>
+        <item name="ManualUnlock" value="0x0E"/>
+    </enum>
+
+    <enum name="DoorLockProgrammingEventCode" type="ENUM8">
+        <cluster code="0x0101"/>
+        <item name="UnknownOrMfgSpecific" value="0x00"/>
+        <item name="MasterCodeChanged" value="0x01"/>
+        <item name="PinAdded" value="0x02"/>
+        <item name="PinDeleted" value="0x03"/>
+        <item name="PinChanged" value="0x04"/>
+        <item name="IdAdded" value="0x05"/>
+        <item name="IdDeleted" value="0x06"/>
+    </enum>
+
+    <enum name="DoorLockUserStatus" type="ENUM8">
+        <cluster code="0x0101"/>
+        <item name="Available" value="0x00"/>
+        <item name="OccupiedEnabled" value="0x01"/>
+        <item name="OccupiedDisabled" value="0x03"/>
+        <item name="NotSupported" value="0xFF"/>
+    </enum>
+
+    <enum name="DoorLockUserType" type="ENUM8">
+        <cluster code="0x0101"/>
+        <item name="Unrestricted" value="0x00"/>
+        <item name="YearDayScheduleUser" value="0x01"/>
+        <item name="WeekDayScheduleUser" value="0x02"/>
+        <item name="MasterUser" value="0x03"/>
+        <item name="NonAccessUser" value="0x04"/>
+        <item name="NotSupported" value="0xFF"/>
+    </enum>
+
+    <bitmap name="DoorLockDayOfWeek" type="BITMAP8">
+        <cluster code="0x0101"/>
+        <field name="Sunday" mask="0x01"/>
+        <field name="Monday" mask="0x02"/>
+        <field name="Tuesday" mask="0x04"/>
+        <field name="Wednesday" mask="0x08"/>
+        <field name="Thursday" mask="0x10"/>
+        <field name="Friday" mask="0x20"/>
+        <field name="Saturday" mask="0x40"/>
+    </bitmap>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/draft/types/door-lock.xml b/src/app/zap-templates/zcl/data-model/draft/types/door-lock.xml
new file mode 100644
index 00000000000000..c9037f350e1ca8
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/draft/types/door-lock.xml
@@ -0,0 +1,78 @@
+<?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="DoorLockState" type="ENUM8">
+    <item name="NotFullyLocked" value="0x00"/>
+    <item name="Locked" value="0x01"/>
+    <item name="Unlocked" value="0x02"/>
+  </enum>
+
+  <enum name="DoorLockSoundVolume" type="ENUM8">
+    <item name="Silent" value="0x00"/>
+    <item name="Low" value="0x01"/>
+    <item name="High" value="0x02"/>
+  </enum>
+
+  <enum name="DoorLockType" type="ENUM8">
+    <item name="DeadBolt" value="0x00"/>
+    <item name="Magnetic" value="0x01"/>
+    <item name="Mortise" value="0x02"/>
+    <item name="Rim" value="0x03"/>
+    <item name="LatchBolt" value="0x04"/>
+    <item name="Cylindrical" value="0x05"/>
+    <item name="Tubular" value="0x06"/>
+    <item name="Interconnected" value="0x07"/>
+    <item name="DeadLatch" value="0x08"/>
+    <item name="Other" value="0x09"/>
+  </enum>
+
+  <enum name="DoorState" type="ENUM8">
+    <item name="Open" value="0x00"/>
+    <item name="Closed" value="0x01"/>
+    <item name="ErrorJammed" value="0x02"/>
+    <item name="ErrorForcedOpen" value="0x03"/>
+    <item name="ErrorUnspecified" value="0x04"/>
+  </enum>
+
+  <enum name="DoorLockOperatingMode" type="ENUM8">
+    <item name="NormalMode" value="0x00"/>
+    <item name="VacationMode" value="0x01"/>
+    <item name="PrivacyMode" value="0x02"/>
+    <item name="NoRfLockOrUnlock" value="0x03"/>
+    <item name="LocalProgrammingMode" value="0x04"/>
+    <item name="PassageMode" value="0x05"/>
+  </enum>
+
+  <enum name="DoorLockSecurityLevel" type="ENUM8">
+    <item name="NetworkSecurity" value="0x00"/>
+    <item name="ApsSecurity" value="0x01"/>
+  </enum>
+
+  <enum name="DoorLockEventType" type="ENUM8">
+    <item name="Operation" value="0x00"/>
+    <item name="Programming" value="0x01"/>
+    <item name="Alarm" value="0x02"/>
+  </enum>
+
+  <enum name="DoorLockEventSource" type="ENUM8">
+    <item name="Keypad" value="0x00"/>
+    <item name="Rf" value="0x01"/>
+    <item name="Manual" value="0x02"/>
+    <item name="Rfid" value="0x03"/>
+    <item name="Indeterminate" value="0xFF"/>
+  </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 89e3ebb75ab0ee..da1a8539d5a85c 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
@@ -270,120 +270,6 @@ limitations under the License.
     <item name="Relative" value="0x00"/>
     <item name="Absolute" value="0x40"/>
   </enum>
-  <enum name="DoorLockState" type="ENUM8">
-    <item name="NotFullyLocked" value="0x00"/>
-    <item name="Locked" value="0x01"/>
-    <item name="Unlocked" value="0x02"/>
-  </enum>
-  <enum name="DoorLockSoundVolume" type="ENUM8">
-    <item name="Silent" value="0x00"/>
-    <item name="Low" value="0x01"/>
-    <item name="High" value="0x02"/>
-  </enum>
-  <enum name="DoorLockType" type="ENUM8">
-    <item name="DeadBolt" value="0x00"/>
-    <item name="Magnetic" value="0x01"/>
-    <item name="Mortise" value="0x02"/>
-    <item name="Rim" value="0x03"/>
-    <item name="LatchBolt" value="0x04"/>
-    <item name="Cylindrical" value="0x05"/>
-    <item name="Tubular" value="0x06"/>
-    <item name="Interconnected" value="0x07"/>
-    <item name="DeadLatch" value="0x08"/>
-    <item name="Other" value="0x09"/>
-  </enum>
-  <enum name="DoorState" type="ENUM8">
-    <item name="Open" value="0x00"/>
-    <item name="Closed" value="0x01"/>
-    <item name="ErrorJammed" value="0x02"/>
-    <item name="ErrorForcedOpen" value="0x03"/>
-    <item name="ErrorUnspecified" value="0x04"/>
-  </enum>
-  <enum name="DoorLockOperatingMode" type="ENUM8">
-    <item name="NormalMode" value="0x00"/>
-    <item name="VacationMode" value="0x01"/>
-    <item name="PrivacyMode" value="0x02"/>
-    <item name="NoRfLockOrUnlock" value="0x03"/>
-    <item name="LocalProgrammingMode" value="0x04"/>
-    <item name="PassageMode" value="0x05"/>
-  </enum>
-  <enum name="DoorLockSecurityLevel" type="ENUM8">
-    <item name="NetworkSecurity" value="0x00"/>
-    <item name="ApsSecurity" value="0x01"/>
-  </enum>
-  <enum name="DoorLockUserStatus" type="ENUM8">
-    <cluster code="0x0101"/>
-    <item name="Available" value="0x00"/>
-    <item name="OccupiedEnabled" value="0x01"/>
-    <item name="OccupiedDisabled" value="0x03"/>
-    <item name="NotSupported" value="0xFF"/>
-  </enum>
-  <enum name="DoorLockUserType" type="ENUM8">
-    <cluster code="0x0101"/>
-    <item name="Unrestricted" value="0x00"/>
-    <item name="YearDayScheduleUser" value="0x01"/>
-    <item name="WeekDayScheduleUser" value="0x02"/>
-    <item name="MasterUser" value="0x03"/>
-    <item name="NonAccessUser" value="0x04"/>
-    <item name="NotSupported" value="0xFF"/>
-  </enum>
-  <bitmap name="DoorLockDayOfWeek" type="BITMAP8">
-    <cluster code="0x0101"/>
-    <field name="Sunday" mask="0x01"/>
-    <field name="Monday" mask="0x02"/>
-    <field name="Tuesday" mask="0x04"/>
-    <field name="Wednesday" mask="0x08"/>
-    <field name="Thursday" mask="0x10"/>
-    <field name="Friday" mask="0x20"/>
-    <field name="Saturday" mask="0x40"/>
-  </bitmap>
-  <enum name="DoorLockEventType" type="ENUM8">
-    <item name="Operation" value="0x00"/>
-    <item name="Programming" value="0x01"/>
-    <item name="Alarm" value="0x02"/>
-  </enum>
-  <enum name="DoorLockEventSource" type="ENUM8">
-    <item name="Keypad" value="0x00"/>
-    <item name="Rf" value="0x01"/>
-    <item name="Manual" value="0x02"/>
-    <item name="Rfid" value="0x03"/>
-    <item name="Indeterminate" value="0xFF"/>
-  </enum>
-  <enum name="DoorLockSetPinOrIdStatus" type="ENUM8">
-    <cluster code="0x0101"/>
-    <item name="Success" value="0x00"/>
-    <item name="GeneralFailure" value="0x01"/>
-    <item name="MemoryFull" value="0x02"/>
-    <item name="DuplicateCodeError" value="0x03"/>
-  </enum>
-  <enum name="DoorLockOperationEventCode" type="ENUM8">
-    <cluster code="0x0101"/>
-    <item name="UnknownOrMfgSpecific" value="0x00"/>
-    <item name="Lock" value="0x01"/>
-    <item name="Unlock" value="0x02"/>
-    <item name="LockInvalidPinOrId" value="0x03"/>
-    <item name="LockInvalidSchedule" value="0x04"/>
-    <item name="UnlockInvalidPinOrId" value="0x05"/>
-    <item name="UnlockInvalidSchedule" value="0x06"/>
-    <item name="OneTouchLock" value="0x07"/>
-    <item name="KeyLock" value="0x08"/>
-    <item name="KeyUnlock" value="0x09"/>
-    <item name="AutoLock" value="0x0A"/>
-    <item name="ScheduleLock" value="0x0B"/>
-    <item name="ScheduleUnlock" value="0x0C"/>
-    <item name="ManualLock" value="0x0D"/>
-    <item name="ManualUnlock" value="0x0E"/>
-  </enum>
-  <enum name="DoorLockProgrammingEventCode" type="ENUM8">
-    <cluster code="0x0101"/>
-    <item name="UnknownOrMfgSpecific" value="0x00"/>
-    <item name="MasterCodeChanged" value="0x01"/>
-    <item name="PinAdded" value="0x02"/>
-    <item name="PinDeleted" value="0x03"/>
-    <item name="PinChanged" value="0x04"/>
-    <item name="IdAdded" value="0x05"/>
-    <item name="IdDeleted" value="0x06"/>
-  </enum>
   <enum name="ProductTypeId" type="ENUM16">
     <item name="WhiteGoods" value="0x0000"/>
     <item name="Dishwasher" value="0x5601"/>
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 27c798c91a1b94..80002a7e8b516c 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -93,6 +93,7 @@
         "lo-devices.xml",
         "zll-devices.xml",
         "types/color-control.xml",
+        "types/door-lock.xml",
         "types/occupancy-sensing.xml",
         "types/thermostat-user-interface-configuration.xml"
     ],
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index 41d08dc3c3afba..9e4d0a5384c028 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -91,6 +91,7 @@
         "lo-devices.xml",
         "zll-devices.xml",
         "types/color-control.xml",
+        "types/door-lock.xml",
         "types/occupancy-sensing.xml",
         "types/thermostat-user-interface-configuration.xml"
     ],