diff --git a/examples/bluetooth/bluedroid/ble/gatt_client/main/gattc_demo.c b/examples/bluetooth/bluedroid/ble/gatt_client/main/gattc_demo.c
index 274d3df2f8..643d75d96e 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_client/main/gattc_demo.c
+++ b/examples/bluetooth/bluedroid/ble/gatt_client/main/gattc_demo.c
@@ -549,7 +549,7 @@ void app_main(void)
         extern void bt_hci_log_hci_adv_show(void);
         bt_hci_log_hci_data_show();
         bt_hci_log_hci_adv_show();
-        vTaskDelay(1000 / portNUM_PROCESSORS);
+        vTaskDelay(1000 / portTICK_PERIOD_MS);
     }
     */
 
diff --git a/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.cfg_test b/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.cfg_test
index 12a643ff74..7432d2902a 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.cfg_test
+++ b/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.cfg_test
@@ -1,2 +1,3 @@
 CONFIG_EXAMPLE_CI_ID=4
 CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
+CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
diff --git a/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_cfg_test b/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_cfg_test
index ec098198ec..17565e75c9 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_cfg_test
+++ b/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_cfg_test
@@ -2,3 +2,4 @@ CONFIG_EXAMPLE_CI_ID=4
 CONFIG_IDF_TARGET="esp32c2"
 CONFIG_XTAL_FREQ_26=y
 CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
+CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
diff --git a/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_init_deinit b/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_init_deinit
index b160178a7f..a2617e3e27 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_init_deinit
+++ b/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_init_deinit
@@ -6,3 +6,4 @@
 CONFIG_IDF_TARGET="esp32c2"
 CONFIG_XTAL_FREQ_26=y
 CONFIG_EXAMPLE_INIT_DEINIT_LOOP=y
+CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
diff --git a/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_xtal26m b/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_xtal26m
index e21eac3c22..6dc203d023 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_xtal26m
+++ b/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_xtal26m
@@ -2,3 +2,4 @@ CONFIG_EXAMPLE_CI_ID=3
 CONFIG_IDF_TARGET="esp32c2"
 CONFIG_XTAL_FREQ_26=y
 CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
+CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
diff --git a/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.init_deinit b/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.init_deinit
index 6131c64c07..0e2519449d 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.init_deinit
+++ b/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.init_deinit
@@ -4,3 +4,4 @@
 # CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
 # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
 CONFIG_EXAMPLE_INIT_DEINIT_LOOP=y
+CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
diff --git a/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.name b/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.name
index 6d167f440e..4e2c283ba1 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.name
+++ b/examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.name
@@ -1,2 +1,3 @@
 CONFIG_EXAMPLE_CI_ID=3
 CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
+CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
diff --git a/examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.ci.esp32c2_xtal26m b/examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.ci.esp32c2_xtal26m
index 18b93a6558..2c4ef8a810 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.ci.esp32c2_xtal26m
+++ b/examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.ci.esp32c2_xtal26m
@@ -2,3 +2,4 @@ CONFIG_EXAMPLE_CI_ID=5
 CONFIG_IDF_TARGET="esp32c2"
 CONFIG_XTAL_FREQ_26=y
 CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
+CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
diff --git a/examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.ci.name b/examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.ci.name
index be962fcb8d..41910369bf 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.ci.name
+++ b/examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.ci.name
@@ -1,2 +1,3 @@
 CONFIG_EXAMPLE_CI_ID=5
 CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
+CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
diff --git a/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.cfg_test b/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.cfg_test
index 63791867a2..f39284f560 100644
--- a/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.cfg_test
+++ b/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.cfg_test
@@ -1,2 +1,3 @@
 CONFIG_EXAMPLE_CI_ID=7
 CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
+CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
diff --git a/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.esp32c2_cfg_test b/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.esp32c2_cfg_test
index a31340300d..fe7be7e050 100644
--- a/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.esp32c2_cfg_test
+++ b/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.esp32c2_cfg_test
@@ -2,3 +2,4 @@ CONFIG_EXAMPLE_CI_ID=7
 CONFIG_IDF_TARGET="esp32c2"
 CONFIG_XTAL_FREQ_26=y
 CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
+CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
diff --git a/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.esp32c2_xtal26m b/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.esp32c2_xtal26m
index 4f8d8a6bc0..64bdb34e61 100644
--- a/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.esp32c2_xtal26m
+++ b/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.esp32c2_xtal26m
@@ -2,3 +2,4 @@ CONFIG_EXAMPLE_CI_ID=6
 CONFIG_IDF_TARGET="esp32c2"
 CONFIG_XTAL_FREQ_26=y
 CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
+CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
diff --git a/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.name b/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.name
index ea659fe46a..52bf8c74d5 100644
--- a/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.name
+++ b/examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.name
@@ -1,2 +1,3 @@
 CONFIG_EXAMPLE_CI_ID=6
 CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
+CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
diff --git a/tools/bt/README.md b/tools/bt/README.md
index c71a7ded1b..1cef81710f 100644
--- a/tools/bt/README.md
+++ b/tools/bt/README.md
@@ -25,7 +25,7 @@ while (1)
     extern void bt_hci_log_hci_adv_show(void);
     bt_hci_log_hci_data_show();  // Display HCI data logs
     bt_hci_log_hci_adv_show();   // Display HCI advertisement logs
-    vTaskDelay(1000 / portNUM_PROCESSORS);
+    vTaskDelay(1000 / portTICK_PERIOD_MS);
 }
 ```