diff --git a/README.md b/README.md
index 90a95ebae..7268ce5f5 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ git clone --recursive https://github.com/espressif/esp-matter.git
 
 ## Supported ESP-IDF and connectedhomeip versions
 
-- ESP Matter currently works with [commit c38e915](https://github.com/project-chip/connectedhomeip/commit/c38e915) of connectedhomeip.
+- ESP Matter currently works with [commit c1d5431](https://github.com/project-chip/connectedhomeip/tree/c1d5431) of connectedhomeip.
 - For Wi-Fi devices (ESP32, ESP32-C3, ESP32-S3), ESP-IDF [v4.4.1 release](https://github.com/espressif/esp-idf/releases/tag/v4.4.1) is required.
 - For Thread devices (ESP32-H2), ESP-IDF master branch at [commit 047903c](https://github.com/espressif/esp-idf/commit/047903c) should be used.
 
diff --git a/components/esp_matter/esp_matter_client.cpp b/components/esp_matter/esp_matter_client.cpp
index 378b47ec1..bedaf13d3 100644
--- a/components/esp_matter/esp_matter_client.cpp
+++ b/components/esp_matter/esp_matter_client.cpp
@@ -61,7 +61,7 @@ void esp_matter_new_connection_failure_callback(void *context, PeerId peerId, CH
 esp_err_t connect(uint8_t fabric_index, uint64_t node_id, uint16_t remote_endpoint_id)
 {
     /* Get info */
-    FabricInfo *fabric_info = chip::Server::GetInstance().GetFabricTable().FindFabricWithIndex(fabric_index);
+    const FabricInfo *fabric_info = chip::Server::GetInstance().GetFabricTable().FindFabricWithIndex(fabric_index);
     if (!fabric_info) {
         ESP_LOGE(TAG, "Couldn't find fabric info");
         return ESP_FAIL;
diff --git a/connectedhomeip/connectedhomeip b/connectedhomeip/connectedhomeip
index c38e9159d..c1d543182 160000
--- a/connectedhomeip/connectedhomeip
+++ b/connectedhomeip/connectedhomeip
@@ -1 +1 @@
-Subproject commit c38e9159d0500a880b9c789bf5d87fa16c039633
+Subproject commit c1d543182fccd0c37c03379602a86fddadff68b1
diff --git a/examples/blemesh_bridge/platform/ESP32_custom/nimble/BLEManagerImpl.cpp b/examples/blemesh_bridge/platform/ESP32_custom/nimble/BLEManagerImpl.cpp
index 2e6b2443c..c53945782 100644
--- a/examples/blemesh_bridge/platform/ESP32_custom/nimble/BLEManagerImpl.cpp
+++ b/examples/blemesh_bridge/platform/ESP32_custom/nimble/BLEManagerImpl.cpp
@@ -110,7 +110,6 @@ SemaphoreHandle_t semaphoreHandle = NULL;
 } // unnamed namespace
 
 BLEManagerImpl BLEManagerImpl::sInstance;
-constexpr System::Clock::Timeout BLEManagerImpl::kAdvertiseTimeout;
 constexpr System::Clock::Timeout BLEManagerImpl::kFastAdvertiseTimeout;
 
 const struct ble_gatt_svc_def BLEManagerImpl::CHIPoBLEGATTAttrs[] = {
@@ -200,7 +199,6 @@ CHIP_ERROR BLEManagerImpl::_SetAdvertisingEnabled(bool val)
     if (val)
     {
         mAdvertiseStartTime = System::SystemClock().GetMonotonicTimestamp();
-        ReturnErrorOnFailure(DeviceLayer::SystemLayer().StartTimer(kAdvertiseTimeout, HandleAdvertisementTimer, this));
         ReturnErrorOnFailure(DeviceLayer::SystemLayer().StartTimer(kFastAdvertiseTimeout, HandleFastAdvertisementTimer, this));
     }
 
@@ -213,22 +211,6 @@ exit:
     return err;
 }
 
-void BLEManagerImpl::HandleAdvertisementTimer(System::Layer * systemLayer, void * context)
-{
-    static_cast<BLEManagerImpl *>(context)->HandleAdvertisementTimer();
-}
-
-void BLEManagerImpl::HandleAdvertisementTimer()
-{
-    System::Clock::Timestamp currentTimestamp = System::SystemClock().GetMonotonicTimestamp();
-
-    if (currentTimestamp - mAdvertiseStartTime >= kAdvertiseTimeout)
-    {
-        mFlags.Set(Flags::kAdvertisingEnabled, 0);
-        PlatformMgr().ScheduleWork(DriveBLEState, 0);
-    }
-}
-
 void BLEManagerImpl::HandleFastAdvertisementTimer(System::Layer * systemLayer, void * context)
 {
     static_cast<BLEManagerImpl *>(context)->HandleFastAdvertisementTimer();