diff --git a/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter b/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter
index ed7b86037fa8d2..57ce56efc3273c 100644
--- a/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter
+++ b/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter
@@ -1697,7 +1697,7 @@ cluster GroupKeyManagement = 63 {
}
/** Supports the ability for clients to request the commissioning of themselves or other nodes onto a fabric which the cluster server can commission onto. */
-provisional cluster CommissionerControl = 1873 {
+cluster CommissionerControl = 1873 {
revision 1;
bitmap SupportedDeviceCategoryBitmap : bitmap32 {
diff --git a/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml b/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml
index bc1d61e64309b5..39a2e2c258ac5f 100644
--- a/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml
@@ -95,7 +95,7 @@ limitations under the License.
UniqueID
ProductAppearance
-
+
The server SHALL attempt to keep the devices specified active for StayActiveDuration milliseconds when they are next active.
diff --git a/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml
index abfd85dde2cd93..dcfb1dfa7096b8 100644
--- a/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml
@@ -21,7 +21,7 @@ limitations under the License.
-
+
General
Commissioner Control
0x0751
diff --git a/src/app/zap-templates/zcl/data-model/chip/ecosystem-information-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ecosystem-information-cluster.xml
index cf84a7e229aed6..73ae522365f410 100644
--- a/src/app/zap-templates/zcl/data-model/chip/ecosystem-information-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/ecosystem-information-cluster.xml
@@ -16,7 +16,7 @@ limitations under the License.
-->
-
+
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 7f5d7fda8698e3..c222fa904e5f4d 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -9590,7 +9590,7 @@ provisional cluster EcosystemInformation = 1872 {
}
/** Supports the ability for clients to request the commissioning of themselves or other nodes onto a fabric which the cluster server can commission onto. */
-provisional cluster CommissionerControl = 1873 {
+cluster CommissionerControl = 1873 {
revision 1;
bitmap SupportedDeviceCategoryBitmap : bitmap32 {