diff --git a/components/esp_matter/esp_matter_cluster.cpp b/components/esp_matter/esp_matter_cluster.cpp
index 86749d512..dac8881f7 100644
--- a/components/esp_matter/esp_matter_cluster.cpp
+++ b/components/esp_matter/esp_matter_cluster.cpp
@@ -125,7 +125,6 @@ cluster_t *create(endpoint_t *endpoint, uint8_t flags)
         global::attribute::create_cluster_revision(cluster, 0);
         global::attribute::create_feature_map(cluster, 0);
         attribute::create_acl(cluster, NULL, 0, 0);
-        attribute::create_extension(cluster, NULL, 0, 0);
         attribute::create_subjects_per_access_control_entry(cluster, 0);
         attribute::create_access_control_entries_per_fabric(cluster, 0);
         attribute::create_targets_per_access_control_entry(cluster, 0);
diff --git a/components/esp_matter/esp_matter_endpoint.cpp b/components/esp_matter/esp_matter_endpoint.cpp
index 3c8ca0a4a..ee03b2c3b 100644
--- a/components/esp_matter/esp_matter_endpoint.cpp
+++ b/components/esp_matter/esp_matter_endpoint.cpp
@@ -213,8 +213,6 @@ endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_dat
     descriptor::create(endpoint, CLUSTER_FLAG_SERVER);
     identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER | CLUSTER_FLAG_CLIENT);
     binding::create(endpoint, &(config->binding), CLUSTER_FLAG_SERVER);
-    groups::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
-    scenes::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
     on_off::create(endpoint, NULL, CLUSTER_FLAG_CLIENT, ESP_MATTER_NONE_FEATURE_ID);
 
     return endpoint;
@@ -239,8 +237,6 @@ endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_dat
     descriptor::create(endpoint, CLUSTER_FLAG_SERVER);
     identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER | CLUSTER_FLAG_CLIENT);
     binding::create(endpoint, &(config->binding), CLUSTER_FLAG_SERVER);
-    groups::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
-    scenes::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
     on_off::create(endpoint, NULL, CLUSTER_FLAG_CLIENT, ESP_MATTER_NONE_FEATURE_ID);
     level_control::create(endpoint, NULL, CLUSTER_FLAG_CLIENT, ESP_MATTER_NONE_FEATURE_ID);
 
@@ -266,8 +262,6 @@ endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_dat
     descriptor::create(endpoint, CLUSTER_FLAG_SERVER);
     identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER | CLUSTER_FLAG_CLIENT);
     binding::create(endpoint, &(config->binding), CLUSTER_FLAG_SERVER);
-    groups::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
-    scenes::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
     on_off::create(endpoint, NULL, CLUSTER_FLAG_CLIENT, ESP_MATTER_NONE_FEATURE_ID);
     level_control::create(endpoint, NULL, CLUSTER_FLAG_CLIENT, ESP_MATTER_NONE_FEATURE_ID);
     color_control::create(endpoint, NULL, CLUSTER_FLAG_CLIENT, ESP_MATTER_NONE_FEATURE_ID);
@@ -296,8 +290,6 @@ endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_dat
     groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER);
     scenes::create(endpoint, &(config->scenes), CLUSTER_FLAG_SERVER);
     on_off::create(endpoint, &(config->on_off), CLUSTER_FLAG_SERVER, on_off::feature::lighting::get_id());
-    level_control::create(endpoint, &(config->level_control), CLUSTER_FLAG_SERVER,
-                          level_control::feature::on_off::get_id() | level_control::feature::lighting::get_id());
 
     return endpoint;
 }
@@ -372,8 +364,8 @@ endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_dat
     descriptor::create(endpoint, CLUSTER_FLAG_SERVER);
     identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER);
     groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER);
-    scenes::create(endpoint, &(config->scenes), CLUSTER_FLAG_SERVER);
     cluster::thermostat::create(endpoint, &(config->thermostat), CLUSTER_FLAG_SERVER);
+    time_synchronization::create(endpoint, &(config->time_synchronization), CLUSTER_FLAG_SERVER | CLUSTER_FLAG_CLIENT);
 
     return endpoint;
 }
diff --git a/components/esp_matter/esp_matter_endpoint.h b/components/esp_matter/esp_matter_endpoint.h
index fa705f8bd..76ef72490 100644
--- a/components/esp_matter/esp_matter_endpoint.h
+++ b/components/esp_matter/esp_matter_endpoint.h
@@ -136,7 +136,6 @@ typedef struct config {
     cluster::groups::config_t groups;
     cluster::scenes::config_t scenes;
     cluster::on_off::config_t on_off;
-    cluster::level_control::config_t level_control;
 } config_t;
 
 uint32_t get_device_type_id();
@@ -173,6 +172,7 @@ typedef struct config {
     cluster::groups::config_t groups;
     cluster::scenes::config_t scenes;
     cluster::thermostat::config_t thermostat;
+    cluster::time_synchronization::config_t time_synchronization;
 } config_t;
 
 uint32_t get_device_type_id();