diff --git a/src/app/zap-templates/zcl/data-model/chip/joint-fabric-administrator-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/joint-fabric-administrator-cluster.xml
index c9515a126a347d..5363e1ac3a1f6a 100644
--- a/src/app/zap-templates/zcl/data-model/chip/joint-fabric-administrator-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/joint-fabric-administrator-cluster.xml
@@ -18,7 +18,7 @@ limitations under the License.
 XML generated by Alchemy; DO NOT EDIT.
 Source: src/service_device_management/JointFabricAdministratorCluster.adoc
 Parameters: 
-Git: 0.9-fall2024-2739-gab998ec5d
+Git: 0.9-fall2024-2942-g1338c37b8-dirty
 -->
 <configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
   <domain name="General"/>
@@ -53,26 +53,46 @@ Git: 0.9-fall2024-2739-gab998ec5d
     <globalAttribute code="0xFFFD" side="either" value="1"/>
     <attribute code="0x0000" side="server" name="AdministratorFabricIndex" define="ADMINISTRATOR_FABRIC_INDEX" type="fabric_idx" isNullable="true" min="1" max="254">
       <access op="read" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </attribute>
     <command code="0x00" source="client" name="ICACCSRRequest" response="ICACCSRResponse">
       <description>This command SHALL be generated during Joint Commissioning Method and subsequently be responded in the form of an ICACCSRResponse command.</description>
       <access op="invoke" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x01" source="server" name="ICACCSRResponse" disableDefaultResponse="true">
       <description>This command SHALL be generated in response to a ICACCSRRequest command.</description>
       <arg id="0" name="ICACCSR" type="long_octet_string" length="600"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x02" source="client" name="AddICAC" response="ICACResponse">
       <description>This command SHALL be generated and executed during Joint Commissioning Method and subsequently be responded in the form of an ICACResponse command.</description>
       <access op="invoke" privilege="administer"/>
       <arg id="1" name="ICACValue" type="long_octet_string" length="400"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x03" source="server" name="ICACResponse" disableDefaultResponse="true">
       <description>This command SHALL be generated in response to the AddICAC command.</description>
       <arg id="0" name="StatusCode" type="ICACResponseStatusEnum" min="0x00" max="0x02"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x04" source="client" name="OpenJointCommissioningWindow">
@@ -83,27 +103,47 @@ Git: 0.9-fall2024-2739-gab998ec5d
       <arg id="2" name="Discriminator" type="int16u" max="4095"/>
       <arg id="3" name="Iterations" type="int32u" min="1000" max="100000"/>
       <arg id="4" name="Salt" type="octet_string" length="32" minLength="16"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x05" source="client" name="TransferAnchorRequest" response="TransferAnchorResponse">
       <description>This command SHALL be sent by a candidate Joint Fabric Anchor Administrator to the current Joint Fabric Anchor Administrator to request transfer of the Anchor Fabric.</description>
       <access op="invoke" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x06" source="server" name="TransferAnchorResponse" disableDefaultResponse="true">
       <description>This command SHALL be generated in response to the Transfer Anchor Request command.</description>
       <arg id="0" name="StatusCode" type="TransferAnchorResponseStatusEnum" min="0x00" max="0x02"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x07" source="client" name="TransferAnchorComplete">
       <description>This command SHALL indicate the completion of the transfer of the Anchor Fabric to another Joint Fabric Ecosystem Administrator.</description>
       <access op="invoke" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x08" source="client" name="AnnounceJointFabricAdministrator">
       <description>This command SHALL be used for communicating to client the endpoint that holds the Joint Fabric Administrator Cluster.</description>
       <access op="invoke" privilege="administer"/>
       <arg id="0" name="EndpointID" type="endpoint_no"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
   </cluster>
diff --git a/src/app/zap-templates/zcl/data-model/chip/joint-fabric-datastore-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/joint-fabric-datastore-cluster.xml
index b355b4ca54fc16..6fe6b983a1c83b 100644
--- a/src/app/zap-templates/zcl/data-model/chip/joint-fabric-datastore-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/joint-fabric-datastore-cluster.xml
@@ -18,7 +18,7 @@ limitations under the License.
 XML generated by Alchemy; DO NOT EDIT.
 Source: src/service_device_management/JointFabricDatastoreCluster.adoc
 Parameters: 
-Git: 0.9-fall2024-2926-g7659b858a
+Git: 0.9-fall2024-2942-g1338c37b8
 -->
 <configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
   <domain name="General"/>
@@ -176,62 +176,130 @@ Git: 0.9-fall2024-2926-g7659b858a
     <globalAttribute code="0xFFFD" side="either" value="1"/>
     <attribute code="0x0000" side="server" name="AnchorRootCA" define="ANCHOR_ROOT_CA" type="octet_string">
       <access op="read" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </attribute>
     <attribute code="0x0001" side="server" name="AnchorNodeID" define="ANCHOR_NODE_ID" type="node_id">
       <access op="read" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </attribute>
     <attribute code="0x0002" side="server" name="AnchorVendorID" define="ANCHOR_VENDOR_ID" type="vendor_id">
       <access op="read" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </attribute>
     <attribute code="0x0003" side="server" name="FriendlyName" define="FRIENDLY_NAME" type="char_string" length="32">
       <access op="read" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </attribute>
     <attribute code="0x0004" side="server" name="GroupKeySetList" define="GROUP_KEY_SET_LIST" type="array" entryType="DatastoreGroupKeySetStruct">
       <access op="read" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </attribute>
     <attribute code="0x0005" side="server" name="GroupList" define="GROUP_LIST" type="array" entryType="DatastoreGroupInformationEntryStruct">
       <access op="read" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </attribute>
     <attribute code="0x0006" side="server" name="NodeList" define="NODE_LIST" type="array" entryType="DatastoreNodeInformationEntryStruct">
       <access op="read" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </attribute>
     <attribute code="0x0007" side="server" name="AdminList" define="ADMIN_LIST" type="array" entryType="DatastoreAdministratorInformationEntryStruct">
       <access op="read" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </attribute>
     <attribute code="0x0008" side="server" name="Status" define="STATUS" type="DatastoreStatusEntryStruct">
       <access op="read" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </attribute>
     <attribute code="0x0009" side="server" name="EndpointGroupIDList" define="ENDPOINT_GROUP_IDLIST" type="array" entryType="DatastoreEndpointGroupIDEntryStruct">
       <access op="read" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </attribute>
     <attribute code="0x000A" side="server" name="EndpointBindingList" define="ENDPOINT_BINDING_LIST" type="array" entryType="DatastoreEndpointBindingEntryStruct">
       <access op="read" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </attribute>
     <attribute code="0x000B" side="server" name="NodeKeySetList" define="NODE_KEY_SET_LIST" type="array" entryType="DatastoreNodeKeySetEntryStruct">
       <access op="read" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </attribute>
     <attribute code="0x000C" side="server" name="NodeACLList" define="NODE_ACLLIST" type="array" entryType="DatastoreACLEntryStruct">
       <access op="read" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </attribute>
     <attribute code="0x000D" side="server" name="NodeEndpointList" define="NODE_ENDPOINT_LIST" type="array" entryType="DatastoreEndpointEntryStruct">
       <access op="read" privilege="administer"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </attribute>
     <command code="0x00" source="client" name="AddKeySet">
       <description>This command SHALL be used to add a KeySet to the Joint Fabric Datastore Cluster of the accessing fabric.</description>
       <access op="invoke" privilege="administer"/>
       <arg id="0" name="GroupKeySet" type="DatastoreGroupKeySetStruct"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x01" source="client" name="UpdateKeySet">
       <description>This command SHALL be used to update a KeySet in the Joint Fabric Datastore Cluster of the accessing fabric.</description>
       <access op="invoke" privilege="administer"/>
       <arg id="0" name="GroupKeySet" type="DatastoreGroupKeySetStruct"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x02" source="client" name="RemoveKeySet">
       <description>This command SHALL be used to remove a KeySet from the Joint Fabric Datastore Cluster of the accessing fabric.</description>
       <access op="invoke" privilege="administer"/>
       <arg id="0" name="GroupKeySetID" type="int16u"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x03" source="client" name="AddGroup">
@@ -243,6 +311,10 @@ Git: 0.9-fall2024-2926-g7659b858a
       <arg id="3" name="GroupCAT" type="int16u" isNullable="true"/>
       <arg id="4" name="GroupCATVersion" type="int16u" isNullable="true" min="1" max="65534"/>
       <arg id="5" name="GroupPermission" type="DatastoreAccessControlEntryPrivilegeEnum" min="0x00" max="0x05"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x04" source="client" name="UpdateGroup">
@@ -254,12 +326,20 @@ Git: 0.9-fall2024-2926-g7659b858a
       <arg id="3" name="GroupCAT" type="int16u" isNullable="true"/>
       <arg id="4" name="GroupCATVersion" type="int16u" isNullable="true" min="1" max="65534"/>
       <arg id="5" name="GroupPermission" type="DatastoreAccessControlEntryPrivilegeEnum" min="0x00" max="0x05"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x05" source="client" name="RemoveGroup">
       <description>This command SHALL be used to remove a group from the Joint Fabric Datastore Cluster of the accessing fabric.</description>
       <access op="invoke" privilege="administer"/>
       <arg id="0" name="GroupID" type="group_id"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x06" source="client" name="AddAdmin">
@@ -269,6 +349,10 @@ Git: 0.9-fall2024-2926-g7659b858a
       <arg id="2" name="FriendlyName" type="char_string" length="32"/>
       <arg id="3" name="VendorID" type="vendor_id"/>
       <arg id="4" name="ICAC" type="long_octet_string" length="400"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x07" source="client" name="UpdateAdmin">
@@ -277,12 +361,20 @@ Git: 0.9-fall2024-2926-g7659b858a
       <arg id="0" name="NodeID" type="node_id" isNullable="true"/>
       <arg id="1" name="FriendlyName" type="char_string" isNullable="true" length="32"/>
       <arg id="2" name="ICAC" type="long_octet_string" isNullable="true" length="400"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x08" source="client" name="RemoveAdmin">
       <description>This command SHALL be used to remove an admin from the Joint Fabric Datastore Cluster of the accessing fabric.</description>
       <access op="invoke" privilege="administer"/>
       <arg id="0" name="NodeID" type="node_id"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x09" source="client" name="AddPendingNode">
@@ -290,12 +382,20 @@ Git: 0.9-fall2024-2926-g7659b858a
       <access op="invoke" privilege="administer"/>
       <arg id="0" name="NodeID" type="node_id"/>
       <arg id="1" name="FriendlyName" type="char_string" length="32"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x0A" source="client" name="RefreshNode">
       <description>The command SHALL be used to request that Datastore information relating to a Node of the accessing fabric is refreshed.</description>
       <access op="invoke" privilege="administer"/>
       <arg id="0" name="NodeID" type="node_id"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x0B" source="client" name="UpdateNode">
@@ -303,12 +403,20 @@ Git: 0.9-fall2024-2926-g7659b858a
       <access op="invoke" privilege="administer"/>
       <arg id="0" name="NodeID" type="node_id"/>
       <arg id="1" name="FriendlyName" type="char_string" length="32"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x0C" source="client" name="RemoveNode">
       <description>This command SHALL be used to remove a node from the Joint Fabric Datastore Cluster of the accessing fabric.</description>
       <access op="invoke" privilege="administer"/>
       <arg id="0" name="NodeID" type="node_id"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x0D" source="client" name="UpdateEndpointForNode">
@@ -317,6 +425,10 @@ Git: 0.9-fall2024-2926-g7659b858a
       <arg id="0" name="EndpointID" type="endpoint_no"/>
       <arg id="1" name="NodeID" type="node_id"/>
       <arg id="2" name="FriendlyName" type="char_string" length="32"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x0E" source="client" name="AddGroupIDToEndpointForNode">
@@ -325,6 +437,10 @@ Git: 0.9-fall2024-2926-g7659b858a
       <arg id="0" name="NodeID" type="node_id"/>
       <arg id="1" name="EndpointID" type="endpoint_no"/>
       <arg id="2" name="GroupID" type="group_id"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x0F" source="client" name="RemoveGroupIDFromEndpointForNode">
@@ -333,6 +449,10 @@ Git: 0.9-fall2024-2926-g7659b858a
       <arg id="0" name="NodeID" type="node_id"/>
       <arg id="1" name="EndpointID" type="endpoint_no"/>
       <arg id="2" name="GroupID" type="group_id"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x10" source="client" name="AddBindingToEndpointForNode">
@@ -341,6 +461,10 @@ Git: 0.9-fall2024-2926-g7659b858a
       <arg id="0" name="NodeID" type="node_id"/>
       <arg id="1" name="EndpointID" type="endpoint_no"/>
       <arg id="2" name="Binding" type="DatastoreBindingTargetStruct"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x11" source="client" name="RemoveBindingFromEndpointForNode">
@@ -349,6 +473,10 @@ Git: 0.9-fall2024-2926-g7659b858a
       <arg id="0" name="ListID" type="int16u"/>
       <arg id="1" name="EndpointID" type="endpoint_no"/>
       <arg id="2" name="NodeID" type="node_id"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x12" source="client" name="AddACLToNode">
@@ -356,6 +484,10 @@ Git: 0.9-fall2024-2926-g7659b858a
       <access op="invoke" privilege="administer"/>
       <arg id="0" name="NodeID" type="node_id"/>
       <arg id="1" name="ACLEntry" type="DatastoreAccessControlEntryStruct"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
     <command code="0x13" source="client" name="RemoveACLFromNode">
@@ -363,6 +495,10 @@ Git: 0.9-fall2024-2926-g7659b858a
       <access op="invoke" privilege="administer"/>
       <arg id="0" name="ListID" type="int16u"/>
       <arg id="1" name="NodeID" type="node_id"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
     </command>
 
   </cluster>