diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index f0f63001f4..5ac167cae1 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -175,19 +175,20 @@
   - "components/asio/asio"
   - "components/bootloader/subproject/components/micro-ecc/micro-ecc"
   - "components/bt/controller/lib_esp32"
+  - "components/bt/controller/lib_esp32c2/esp32c2-bt-lib"
   - "components/bt/controller/lib_esp32c3_family"
+  - "components/bt/controller/lib_esp32h2/esp32h2-bt-lib"
   - "components/bt/host/nimble/nimble"
   - "components/cmock/CMock"
-  - "components/cmock/CMock/vendor/c_exception"
-  - "components/cmock/CMock/vendor/unity"
   - "components/esp_phy/lib"
   - "components/esp_wifi/lib"
-  - "components/esptool_py/esptool"
+  - "components/ieee802154/lib"
   - "components/json/cJSON"
   - "components/lwip/lwip"
   - "components/mbedtls/mbedtls"
   - "components/mqtt/esp-mqtt"
   - "components/openthread/lib"
+  - "components/openthread/openthread"
   - "components/protobuf-c/protobuf-c"
   - "components/spiffs/spiffs"
   - "components/tinyusb/tinyusb"
diff --git a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib
index 14e64db09a..d652897062 160000
--- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib
+++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib
@@ -1 +1 @@
-Subproject commit 14e64db09a260545f0d26f5bbd55965b0c068c1c
+Subproject commit d6528970622a611dc9ad4a9fc31a5a9fc1996d74
diff --git a/components/bt/include/esp32c2/include/esp_bt_cfg.h b/components/bt/include/esp32c2/include/esp_bt_cfg.h
index ca309f7b9f..a6eacac671 100644
--- a/components/bt/include/esp32c2/include/esp_bt_cfg.h
+++ b/components/bt/include/esp32c2/include/esp_bt_cfg.h
@@ -128,8 +128,8 @@ extern "C" {
 #define HCI_UART_EN 0 // hci ram mode
 #endif
 
-#ifdef CONFIG_BT_NIMBLE_SLEEP_ENABLE
-#define NIMBLE_SLEEP_ENABLE CONFIG_BT_NIMBLE_SLEEP_ENABLE
+#ifdef CONFIG_BT_LE_SLEEP_ENABLE
+#define NIMBLE_SLEEP_ENABLE CONFIG_BT_LE_SLEEP_ENABLE
 #else
 #define NIMBLE_SLEEP_ENABLE  0
 #endif
diff --git a/components/bt/include/esp32h2/include/esp_bt_cfg.h b/components/bt/include/esp32h2/include/esp_bt_cfg.h
index ca309f7b9f..a6eacac671 100644
--- a/components/bt/include/esp32h2/include/esp_bt_cfg.h
+++ b/components/bt/include/esp32h2/include/esp_bt_cfg.h
@@ -128,8 +128,8 @@ extern "C" {
 #define HCI_UART_EN 0 // hci ram mode
 #endif
 
-#ifdef CONFIG_BT_NIMBLE_SLEEP_ENABLE
-#define NIMBLE_SLEEP_ENABLE CONFIG_BT_NIMBLE_SLEEP_ENABLE
+#ifdef CONFIG_BT_LE_SLEEP_ENABLE
+#define NIMBLE_SLEEP_ENABLE CONFIG_BT_LE_SLEEP_ENABLE
 #else
 #define NIMBLE_SLEEP_ENABLE  0
 #endif
diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
index 0bdfdd066f..457fd948c2 100644
--- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
+++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -610,7 +610,6 @@ r_ble_hw_periodiclist_add = 0x40000b74;
 r_ble_hw_periodiclist_clear = 0x40000b78;
 r_ble_hw_periodiclist_rmv = 0x40000b7c;
 r_ble_hw_resolv_list_cur_entry = 0x40000b80;
-r_ble_hw_resolv_list_get_cur_entry = 0x40000b84;
 r_ble_hw_resolv_list_set = 0x40000b88;
 r_ble_hw_rng_init = 0x40000b8c;
 r_ble_hw_rng_start = 0x40000b90;
@@ -1288,7 +1287,6 @@ r_ble_lll_hci_dtm_tx_test_v2 = 0x40001614;
 r_ble_lll_hci_dtm_tx_test_v2_ext = 0x40001618;
 r_ble_lll_init = 0x4000161c;
 r_ble_lll_init_pre_process = 0x40001620;
-r_ble_lll_init_rx_pkt_isr = 0x40001624;
 r_ble_lll_per_adv_coex_dpc_calc_pti_update_itvl = 0x40001628;
 r_ble_lll_per_adv_coex_dpc_process = 0x4000162c;
 r_ble_lll_per_adv_coex_dpc_pti_get = 0x40001630;