diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 07116d291ab86a..30b73fc72eb698 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -202,8 +202,6 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/window-covering.xml \
                       src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/matter-devices.xml \
-                      src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml \
-                      src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/sample-mei-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml \
diff --git a/scripts/rules.matterlint b/scripts/rules.matterlint
index 9ab27244c30bbb..f805867fe5e7e2 100644
--- a/scripts/rules.matterlint
+++ b/scripts/rules.matterlint
@@ -117,8 +117,6 @@ load "../src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.x
 load "../src/app/zap-templates/zcl/data-model/chip/sample-mei-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml";
-load "../src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml";
-load "../src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml";
 
 all endpoints {
     // These attributes follow a different code path and do not have to be
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 b5b0a7a464bb3d..64c8668e63f17b 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -6,7 +6,6 @@
   "xmlRoot": [
     ".",
     "./data-model/chip/",
-    "./data-model/draft/",
     "./data-model/silabs/",
     "./data-model/test"
   ],
@@ -50,7 +49,6 @@
     "ecosystem-information-cluster.xml",
     "energy-preference-cluster.xml",
     "electrical-energy-measurement-cluster.xml",
-    "electrical-measurement-cluster.xml",
     "electrical-power-measurement-cluster.xml",
     "energy-evse-cluster.xml",
     "energy-evse-mode-cluster.xml",
@@ -87,7 +85,6 @@
     "network-commissioning-cluster.xml",
     "occupancy-sensing-cluster.xml",
     "onoff-cluster.xml",
-    "onoff-switch-configuration-cluster.xml",
     "operational-credentials-cluster.xml",
     "operational-state-cluster.xml",
     "operational-state-oven-cluster.xml",
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index 4b9ca28c0a6b3e..0ac946aba3f2e9 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -6,7 +6,6 @@
   "xmlRoot": [
     ".",
     "./data-model/chip/",
-    "./data-model/draft/",
     "./data-model/silabs/"
   ],
   "_comment": "Ensure access-control-definitions.xml is first in xmlFile array",
@@ -47,7 +46,6 @@
     "drlc-cluster.xml",
     "ecosystem-information-cluster.xml",
     "electrical-energy-measurement-cluster.xml",
-    "electrical-measurement-cluster.xml",
     "electrical-power-measurement-cluster.xml",
     "energy-evse-cluster.xml",
     "energy-evse-mode-cluster.xml",
@@ -84,7 +82,6 @@
     "network-commissioning-cluster.xml",
     "occupancy-sensing-cluster.xml",
     "onoff-cluster.xml",
-    "onoff-switch-configuration-cluster.xml",
     "operational-credentials-cluster.xml",
     "operational-state-cluster.xml",
     "operational-state-oven-cluster.xml",