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 40c98531cb6c03..83b1b3daec0dbb 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -259,5 +259,11 @@
         ]
     },
     "defaultReportingPolicy": "mandatory",
-    "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"]
+    "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],
+    "fabricHandling": {
+        "automaticallyCreateFields": true,
+        "indexFieldId": 254,
+        "indexFieldName": "FabricIndex",
+        "indexType": "fabric_idx"
+    }
 }
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index c66942a00ce454..525bf98efe4a82 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -253,5 +253,11 @@
         ]
     },
     "defaultReportingPolicy": "mandatory",
-    "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"]
+    "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],
+    "fabricHandling": {
+        "automaticallyCreateFields": true,
+        "indexFieldId": 254,
+        "indexFieldName": "FabricIndex",
+        "indexType": "fabric_idx"
+    }
 }