diff --git a/connectedhomeip/connectedhomeip b/connectedhomeip/connectedhomeip
index bc8c9ece1..bd17b9f52 160000
--- a/connectedhomeip/connectedhomeip
+++ b/connectedhomeip/connectedhomeip
@@ -1 +1 @@
-Subproject commit bc8c9ece127e42033543ecfa7b03341e6dcff1cc
+Subproject commit bd17b9f52f41eeac5aaa74c1ecf3a76e06dd6958
diff --git a/device_hal/device/esp32c6_devkit_c/esp_matter_device.cmake b/device_hal/device/esp32c6_devkit_c/esp_matter_device.cmake
index aaee85384..69a682d39 100644
--- a/device_hal/device/esp32c6_devkit_c/esp_matter_device.cmake
+++ b/device_hal/device/esp32c6_devkit_c/esp_matter_device.cmake
@@ -3,9 +3,9 @@ if (NOT ("${IDF_TARGET}" STREQUAL "esp32c6" ))
     message(FATAL_ERROR "please set esp32c6 as the IDF_TARGET using 'idf.py --preview set-target esp32c6'")
 endif()
 
-SET(device_type     esp32c2_devkit_m)
-SET(led_type        gpio)
-SET(button_type     hollow_button)
+SET(device_type     esp32c6_devkit_c)
+SET(led_type        ws2812)
+SET(button_type     iot)
 
 SET(extra_components_dirs_append "$ENV{ESP_MATTER_DEVICE_PATH}/../../led_driver"
-                                 "$ENV{ESP_MATTER_DEVICE_PATH}/../../button_driver/button")
+                                 "$ENV{ESP_MATTER_DEVICE_PATH}/../../button_driver/iot_button")
diff --git a/examples/common/blemesh_platform/platform/ESP32_custom/BUILD.gn b/examples/common/blemesh_platform/platform/ESP32_custom/BUILD.gn
index 3399fe9c7..77fc38141 100644
--- a/examples/common/blemesh_platform/platform/ESP32_custom/BUILD.gn
+++ b/examples/common/blemesh_platform/platform/ESP32_custom/BUILD.gn
@@ -26,6 +26,9 @@ declare_args() {
   chip_use_factory_data_provider = false
   chip_use_device_info_provider = false
   chip_config_software_version_number = 0
+  chip_enable_chipoble = true
+  chip_bt_nimble_enabled = true
+  chip_bt_bluedroid_enabled = true
 }
 
 config("ESP32_custom_include") {
@@ -76,7 +79,6 @@ group("platform_buildconfig") {
 static_library("ESP32_custom") {
   sources = [
     "${chip_root}/src/platform/SingletonConfigurationManager.cpp",
-    "BLEManagerImpl.h",
     "CHIPDevicePlatformConfig.h",
     "CHIPDevicePlatformEvent.h",
     "ConfigurationManagerImpl.cpp",
@@ -97,8 +99,6 @@ static_library("ESP32_custom") {
     "PlatformManagerImpl.h",
     "SystemTimeSupport.cpp",
     "SystemTimeSupport.h",
-    "bluedroid/BLEManagerImpl.cpp",
-    "nimble/BLEManagerImpl.cpp",
   ]
 
   deps = [
@@ -125,6 +125,24 @@ static_library("ESP32_custom") {
     ]
   }
 
+  if (chip_enable_chipoble) {
+    sources += [
+      "BLEManagerImpl.h",
+    ]
+  }
+
+  if (chip_bt_nimble_enabled) {
+    sources += [
+      "nimble/BLEManagerImpl.cpp",
+    ]
+  }
+
+  if (chip_bt_bluedroid_enabled) {
+    sources += [
+      "bluedroid/BLEManagerImpl.cpp",
+    ]
+  }
+
   if (chip_enable_wifi) {
     sources += [
       "ConnectivityManagerImpl_WiFi.cpp",
diff --git a/examples/common/external_platform/BUILD.gn b/examples/common/external_platform/BUILD.gn
index df57cba42..9b72832b4 100644
--- a/examples/common/external_platform/BUILD.gn
+++ b/examples/common/external_platform/BUILD.gn
@@ -24,6 +24,9 @@ declare_args() {
   chip_use_factory_data_provider = false
   chip_use_device_info_provider = false
   chip_config_software_version_number = 0
+  chip_enable_chipoble = true
+  chip_bt_nimble_enabled = true
+  chip_bt_bluedroid_enabled = true
 }
 
 config("ESP32_custom_include") {
@@ -73,7 +76,6 @@ group("platform_buildconfig") {
 static_library("ESP32_custom") {
   sources = [
     "${chip_root}/src/platform/SingletonConfigurationManager.cpp",
-    "BLEManagerImpl.h",
     "CHIPDevicePlatformConfig.h",
     "CHIPDevicePlatformEvent.h",
     "ConfigurationManagerImpl.cpp",
@@ -94,8 +96,6 @@ static_library("ESP32_custom") {
     "PlatformManagerImpl.h",
     "SystemTimeSupport.cpp",
     "SystemTimeSupport.h",
-    "bluedroid/BLEManagerImpl.cpp",
-    "nimble/BLEManagerImpl.cpp",
   ]
 
   deps = [
@@ -120,6 +120,24 @@ static_library("ESP32_custom") {
     ]
   }
 
+  if (chip_enable_chipoble) {
+    sources += [
+      "BLEManagerImpl.h",
+    ]
+  }
+
+  if (chip_bt_nimble_enabled) {
+    sources += [
+      "nimble/BLEManagerImpl.cpp",
+    ]
+  }
+
+  if (chip_bt_bluedroid_enabled) {
+    sources += [
+      "bluedroid/BLEManagerImpl.cpp",
+    ]
+  }
+
   if (chip_enable_wifi) {
     sources += [
       "ConnectivityManagerImpl_WiFi.cpp",
diff --git a/install.sh b/install.sh
index 3ef664bdb..c9e6ce47e 100755
--- a/install.sh
+++ b/install.sh
@@ -20,7 +20,7 @@ echo ""
 # output after cut: zap/zap-v2023.03.06-nightly
 # TODO: Remove the zap-version after https://github.com/project-chip/connectedhomeip/pull/25727 merged
 zap_path=`python3 ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/scripts/tools/zap/zap_download.py \
-    --sdk-root ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip --zap RELEASE --zap-version v2023.03.06-nightly \
+    --sdk-root ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip --zap RELEASE --zap-version v2023.03.27-nightly \
     --extract-root .zap 2>/dev/null | cut -d= -f2`
 # Check whether the download is successful.
 if [ -z $zap_path ]; then