diff --git a/examples/lighting-app/lighting-common/gen/endpoint_config.h b/examples/lighting-app/lighting-common/gen/endpoint_config.h
index 70c37bde9d2ec9..b84160d8b003dc 100644
--- a/examples/lighting-app/lighting-common/gen/endpoint_config.h
+++ b/examples/lighting-app/lighting-common/gen/endpoint_config.h
@@ -50,13 +50,16 @@
     }
 
 // Cluster function static arrays
-#define GENERATED_FUNCTION_ARRAYS
+#define GENERATED_FUNCTION_ARRAYS                                                                                                  \
+    const EmberAfGenericClusterFunction emberAfFuncArrayOnOffClusterServer[] = { (                                                 \
+        EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback };
 
 // Clusters definitions
 #define GENERATED_CLUSTERS                                                                                                         \
     {                                                                                                                              \
         {                                                                                                                          \
-            0x0006, (EmberAfAttributeMetadata *) &(generatedAttributes[0]), 2, 3, (CLUSTER_MASK_SERVER), NULL,                     \
+            0x0006, (EmberAfAttributeMetadata *) &(generatedAttributes[0]), 2,                                                     \
+            3,      (CLUSTER_MASK_SERVER | CLUSTER_MASK_INIT_FUNCTION),     emberAfFuncArrayOnOffClusterServer,                    \
         },                                                                                                                         \
     }
 
diff --git a/examples/lighting-app/lighting-common/gen/gen_config.h b/examples/lighting-app/lighting-common/gen/gen_config.h
index b1b1add4cd37b2..f7efba427e27c3 100644
--- a/examples/lighting-app/lighting-common/gen/gen_config.h
+++ b/examples/lighting-app/lighting-common/gen/gen_config.h
@@ -89,6 +89,7 @@
 #define EMBER_CALLBACK_ON_OFF_CLUSTER_OFF
 #define EMBER_CALLBACK_ON_OFF_CLUSTER_ON
 #define EMBER_CALLBACK_ON_OFF_CLUSTER_TOGGLE
+#define EMBER_CALLBACK_ON_OFF_CLUSTER_ON_OFF_CLUSTER_SERVER_INIT
 #define EMBER_CALLBACK_ENERGY_SCAN_RESULT
 #define EMBER_CALLBACK_SCAN_COMPLETE
 #define EMBER_CALLBACK_NETWORK_FOUND
diff --git a/examples/lock-app/lock-common/gen/endpoint_config.h b/examples/lock-app/lock-common/gen/endpoint_config.h
index 70c37bde9d2ec9..b84160d8b003dc 100644
--- a/examples/lock-app/lock-common/gen/endpoint_config.h
+++ b/examples/lock-app/lock-common/gen/endpoint_config.h
@@ -50,13 +50,16 @@
     }
 
 // Cluster function static arrays
-#define GENERATED_FUNCTION_ARRAYS
+#define GENERATED_FUNCTION_ARRAYS                                                                                                  \
+    const EmberAfGenericClusterFunction emberAfFuncArrayOnOffClusterServer[] = { (                                                 \
+        EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback };
 
 // Clusters definitions
 #define GENERATED_CLUSTERS                                                                                                         \
     {                                                                                                                              \
         {                                                                                                                          \
-            0x0006, (EmberAfAttributeMetadata *) &(generatedAttributes[0]), 2, 3, (CLUSTER_MASK_SERVER), NULL,                     \
+            0x0006, (EmberAfAttributeMetadata *) &(generatedAttributes[0]), 2,                                                     \
+            3,      (CLUSTER_MASK_SERVER | CLUSTER_MASK_INIT_FUNCTION),     emberAfFuncArrayOnOffClusterServer,                    \
         },                                                                                                                         \
     }
 
diff --git a/examples/lock-app/lock-common/gen/gen_config.h b/examples/lock-app/lock-common/gen/gen_config.h
index b1b1add4cd37b2..f7efba427e27c3 100644
--- a/examples/lock-app/lock-common/gen/gen_config.h
+++ b/examples/lock-app/lock-common/gen/gen_config.h
@@ -89,6 +89,7 @@
 #define EMBER_CALLBACK_ON_OFF_CLUSTER_OFF
 #define EMBER_CALLBACK_ON_OFF_CLUSTER_ON
 #define EMBER_CALLBACK_ON_OFF_CLUSTER_TOGGLE
+#define EMBER_CALLBACK_ON_OFF_CLUSTER_ON_OFF_CLUSTER_SERVER_INIT
 #define EMBER_CALLBACK_ENERGY_SCAN_RESULT
 #define EMBER_CALLBACK_SCAN_COMPLETE
 #define EMBER_CALLBACK_NETWORK_FOUND