diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index 13caede03b2814..693491520da45e 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -7050,7 +7050,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x0023;
-    ram      attribute clusterRevision default = 5;
+    ram      attribute clusterRevision default = 6;
   }
 
   server cluster FanControl {
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
index 9ab2cbb930fb48..6a05673a0de74e 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -33,7 +33,7 @@
   ],
   "endpointTypes": [
     {
-      "id": 13,
+      "id": 1,
       "name": "MA-rootdevice",
       "deviceTypeRef": {
         "id": 3,
@@ -10512,7 +10512,7 @@
       ]
     },
     {
-      "id": 14,
+      "id": 2,
       "name": "MA-onofflight",
       "deviceTypeRef": {
         "id": 8,
@@ -21228,7 +21228,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "5",
+              "defaultValue": "6",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -30613,7 +30613,7 @@
       ]
     },
     {
-      "id": 15,
+      "id": 3,
       "name": "MA-onofflight",
       "deviceTypeRef": {
         "id": 8,
@@ -34897,7 +34897,7 @@
       ]
     },
     {
-      "id": 16,
+      "id": 4,
       "name": "Anonymous Endpoint Type",
       "deviceTypeRef": {
         "id": 53,
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
index be7bf99502b438..93b04f141025b3 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -1686,7 +1686,7 @@ endpoint 1 {
     callback attribute acceptedCommandList default = 0;
     callback attribute attributeList default = 0;
     ram      attribute featureMap default = 0x3f;
-    ram      attribute clusterRevision default = 3;
+    ram      attribute clusterRevision default = 6;
   }
 
   server cluster ThermostatUserInterfaceConfiguration {
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
index c296ec43258019..22f3247af489bf 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
@@ -16,6 +16,12 @@
     }
   ],
   "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl.json",
@@ -23,20 +29,14 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
-    },
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
     {
-      "id": 2,
+      "id": 7,
       "name": "MA-rootdevice",
       "deviceTypeRef": {
-        "id": 2,
+        "id": 55,
         "code": 22,
         "profileId": 259,
         "label": "MA-rootdevice",
@@ -44,7 +44,7 @@
       },
       "deviceTypes": [
         {
-          "id": 2,
+          "id": 55,
           "code": 22,
           "profileId": 259,
           "label": "MA-rootdevice",
@@ -52,7 +52,7 @@
         }
       ],
       "deviceTypeRefs": [
-        2
+        55
       ],
       "deviceVersions": [
         1
@@ -5468,10 +5468,10 @@
       ]
     },
     {
-      "id": 1,
+      "id": 8,
       "name": "Anonymous Endpoint Type",
       "deviceTypeRef": {
-        "id": 34,
+        "id": 87,
         "code": 769,
         "profileId": 259,
         "label": "MA-thermostat",
@@ -5479,7 +5479,7 @@
       },
       "deviceTypes": [
         {
-          "id": 34,
+          "id": 87,
           "code": 769,
           "profileId": 259,
           "label": "MA-thermostat",
@@ -5487,7 +5487,7 @@
         }
       ],
       "deviceTypeRefs": [
-        34
+        87
       ],
       "deviceVersions": [
         1
@@ -7523,7 +7523,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "6",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index 05c0e0d8e2b08c..67be1476e76796 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -1993,7 +1993,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x23;
-    ram      attribute clusterRevision default = 5;
+    ram      attribute clusterRevision default = 6;
   }
 
   server cluster ThermostatUserInterfaceConfiguration {
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
index b15be332da2516..0a6a637d51fb2a 100644
--- a/examples/thermostat/thermostat-common/thermostat.zap
+++ b/examples/thermostat/thermostat-common/thermostat.zap
@@ -16,6 +16,12 @@
     }
   ],
   "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl.json",
@@ -23,20 +29,14 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
-    },
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
     {
-      "id": 1,
+      "id": 5,
       "name": "MA-rootdevice",
       "deviceTypeRef": {
-        "id": 2,
+        "id": 55,
         "code": 22,
         "profileId": 259,
         "label": "MA-rootdevice",
@@ -44,7 +44,7 @@
       },
       "deviceTypes": [
         {
-          "id": 2,
+          "id": 55,
           "code": 22,
           "profileId": 259,
           "label": "MA-rootdevice",
@@ -52,7 +52,7 @@
         }
       ],
       "deviceTypeRefs": [
-        2
+        55
       ],
       "deviceVersions": [
         1
@@ -7655,10 +7655,10 @@
       ]
     },
     {
-      "id": 2,
+      "id": 6,
       "name": "MA-thermostat",
       "deviceTypeRef": {
-        "id": 34,
+        "id": 87,
         "code": 769,
         "profileId": 259,
         "label": "MA-thermostat",
@@ -7666,7 +7666,7 @@
       },
       "deviceTypes": [
         {
-          "id": 34,
+          "id": 87,
           "code": 769,
           "profileId": 259,
           "label": "MA-thermostat",
@@ -7674,7 +7674,7 @@
         }
       ],
       "deviceTypeRefs": [
-        34
+        87
       ],
       "deviceVersions": [
         1
@@ -11678,7 +11678,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "5",
+              "defaultValue": "6",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,