diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd61567df..483bebdf9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ variables:
     IDF_CHECKOUT_REF: "v5.2.3"
     # This variable represents the short hash of the connectedhomeip submodule.
     # Note: Do change this short hash on submodule update MRs.
-    CHIP_SHORT_HASH: "cd07c4f5c3"
+    CHIP_SHORT_HASH: "4d96e832bd"
     DOCKER_IMAGE_NAME: "espressif/chip-idf"
 
 .add_gitlab_ssh_key: &add_gitlab_ssh_key |
diff --git a/README.md b/README.md
index d1f975d4c..ef9f2da9e 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ section in the ESP-Matter Programming Guide.
 
 ## Supported ESP-IDF and connectedhomeip versions
 
-- This SDK currently works with commit [cd07c4f5c3](https://github.com/project-chip/connectedhomeip/tree/cd07c4f5c3) of connectedhomeip.
+- This SDK currently works with commit [4d96e832bd](https://github.com/project-chip/connectedhomeip/tree/4d96e832bd) of connectedhomeip.
 - For Matter projects development with this SDK, it is recommended to utilize ESP-IDF [v5.2.3](https://github.com/espressif/esp-idf/tree/v5.2.3).
 
 ## Documentation
diff --git a/components/esp_matter/esp_matter_command.cpp b/components/esp_matter/esp_matter_command.cpp
index abc03cabf..de40ff22a 100644
--- a/components/esp_matter/esp_matter_command.cpp
+++ b/components/esp_matter/esp_matter_command.cpp
@@ -135,53 +135,6 @@ static esp_err_t esp_matter_command_callback_key_set_read_all_indices(const Conc
     return ESP_OK;
 }
 
-static esp_err_t esp_matter_command_callback_arm_fail_safe(const ConcreteCommandPath &command_path, TLVReader &tlv_data,
-                                                           void *opaque_ptr)
-{
-    chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafe::DecodableType command_data;
-    CHIP_ERROR error = Decode(tlv_data, command_data);
-    if (error == CHIP_NO_ERROR) {
-        emberAfGeneralCommissioningClusterArmFailSafeCallback((CommandHandler *)opaque_ptr, command_path, command_data);
-    }
-    return ESP_OK;
-}
-
-static esp_err_t esp_matter_command_callback_set_regulatory_config(const ConcreteCommandPath &command_path,
-                                                                   TLVReader &tlv_data, void *opaque_ptr)
-{
-    chip::app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfig::DecodableType command_data;
-    CHIP_ERROR error = Decode(tlv_data, command_data);
-    if (error == CHIP_NO_ERROR) {
-        emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback((CommandHandler *)opaque_ptr, command_path,
-                                                                      command_data);
-    }
-    return ESP_OK;
-}
-
-static esp_err_t esp_matter_command_callback_commissioning_complete(const ConcreteCommandPath &command_path,
-                                                                    TLVReader &tlv_data, void *opaque_ptr)
-{
-    chip::app::Clusters::GeneralCommissioning::Commands::CommissioningComplete::DecodableType command_data;
-    CHIP_ERROR error = Decode(tlv_data, command_data);
-    if (error == CHIP_NO_ERROR) {
-        emberAfGeneralCommissioningClusterCommissioningCompleteCallback((CommandHandler *)opaque_ptr, command_path,
-                                                                        command_data);
-    }
-    return ESP_OK;
-}
-
-static esp_err_t esp_matter_command_callback_set_tc_acknowledgements(const ConcreteCommandPath &command_path,
-                                                                    TLVReader &tlv_data, void *opaque_ptr)
-{
-    chip::app::Clusters::GeneralCommissioning::Commands::SetTCAcknowledgements::DecodableType command_data;
-    CHIP_ERROR error = Decode(tlv_data, command_data);
-    if (error == CHIP_NO_ERROR) {
-        emberAfGeneralCommissioningClusterSetTCAcknowledgementsCallback((CommandHandler *)opaque_ptr, command_path,
-                                                                        command_data);
-    }
-    return ESP_OK;
-}
-
 static esp_err_t esp_matter_command_callback_open_commissioning_window(const ConcreteCommandPath &command_path,
                                                                        TLVReader &tlv_data, void *opaque_ptr)
 {
@@ -1877,11 +1830,9 @@ namespace general_commissioning {
 namespace command {
 
 constexpr const command_entry_t accepted_command_list[] = {
-    {GeneralCommissioning::Commands::ArmFailSafe::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_arm_fail_safe},
-    {GeneralCommissioning::Commands::SetRegulatoryConfig::Id, COMMAND_FLAG_ACCEPTED,
-     esp_matter_command_callback_set_regulatory_config},
-    {GeneralCommissioning::Commands::CommissioningComplete::Id, COMMAND_FLAG_ACCEPTED,
-     esp_matter_command_callback_commissioning_complete},
+    {GeneralCommissioning::Commands::ArmFailSafe::Id, COMMAND_FLAG_ACCEPTED, nullptr},
+    {GeneralCommissioning::Commands::SetRegulatoryConfig::Id, COMMAND_FLAG_ACCEPTED, nullptr},
+    {GeneralCommissioning::Commands::CommissioningComplete::Id, COMMAND_FLAG_ACCEPTED, nullptr},
 };
 
 constexpr const command_entry_t generated_command_list[] = {
@@ -1893,19 +1844,19 @@ constexpr const command_entry_t generated_command_list[] = {
 command_t *create_arm_fail_safe(cluster_t *cluster)
 {
     return esp_matter::command::create(cluster, GeneralCommissioning::Commands::ArmFailSafe::Id, COMMAND_FLAG_ACCEPTED,
-                                       esp_matter_command_callback_arm_fail_safe);
+                                       nullptr);
 }
 
 command_t *create_set_regulatory_config(cluster_t *cluster)
 {
     return esp_matter::command::create(cluster, GeneralCommissioning::Commands::SetRegulatoryConfig::Id,
-                                       COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_set_regulatory_config);
+                                       COMMAND_FLAG_ACCEPTED, nullptr);
 }
 
 command_t *create_commissioning_complete(cluster_t *cluster)
 {
     return esp_matter::command::create(cluster, GeneralCommissioning::Commands::CommissioningComplete::Id,
-                                       COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_commissioning_complete);
+                                       COMMAND_FLAG_ACCEPTED, nullptr);
 }
 
 command_t *create_arm_fail_safe_response(cluster_t *cluster)
@@ -1929,7 +1880,7 @@ command_t *create_commissioning_complete_response(cluster_t *cluster)
 command_t *create_set_tc_acknowledgements(cluster_t *cluster)
 {
     return esp_matter::command::create(cluster, GeneralCommissioning::Commands::SetTCAcknowledgements::Id,
-                                       COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_set_tc_acknowledgements);
+                                       COMMAND_FLAG_ACCEPTED, nullptr);
 }
 
 command_t *create_set_tc_acknowledgements_response(cluster_t *cluster)
diff --git a/connectedhomeip/connectedhomeip b/connectedhomeip/connectedhomeip
index cd07c4f5c..4d96e832b 160000
--- a/connectedhomeip/connectedhomeip
+++ b/connectedhomeip/connectedhomeip
@@ -1 +1 @@
-Subproject commit cd07c4f5c3988258e6eba9d34d3dc0767d95e5a3
+Subproject commit 4d96e832bd87756a6b145ffa52859ff97c5124c0