diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index d0d958848323de..d49841e22c3d97 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -7621,10 +7621,28 @@
       attributes:
           PowerSource:
               - EndpointList
+          Descriptor:
+              - TagList
+      structs:
+          Descriptor:
+              - SemanticTagStruct
+      struct fields:
+          Descriptor:
+              SemanticTagStruct:
+                  - mfgCode
+                  - namespaceID
+                  - tag
+                  - label
+      bitmaps:
+          GroupKeyManagement:
+              - Feature
       bitmap values:
           OnOff:
               Feature:
                   - DeadFront
+          GroupKeyManagement:
+              Feature:
+                  - CacheAndSync
   removed:
       clusters:
           # Clusters that really should just not be exposed, even if they're in our XML.