diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
index 1d8ec1189c..bbb82d4104 100644
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -206,6 +206,7 @@
 
 /tools/                       @esp-idf-codeowners/tools
 /tools/ble/                   @esp-idf-codeowners/app-utilities
+/tools/bt/                    @esp-idf-codeowners/bluetooth
 /tools/catch/                 @esp-idf-codeowners/ci
 /tools/ci/                    @esp-idf-codeowners/ci
 /tools/cmake/                 @esp-idf-codeowners/build-config
diff --git a/components/esp_hid/src/nimble_hidd.c b/components/esp_hid/src/nimble_hidd.c
index dc37302e05..26bb6ea178 100644
--- a/components/esp_hid/src/nimble_hidd.c
+++ b/components/esp_hid/src/nimble_hidd.c
@@ -132,7 +132,7 @@ static int create_hid_db(int device_index)
     return rc;
 }
 
-static int ble_hid_create_info_db()
+static int ble_hid_create_info_db(void)
 {
     int rc;
 
diff --git a/examples/bluetooth/blufi/sdkconfig.ci.nimble b/examples/bluetooth/blufi/sdkconfig.ci.nimble
new file mode 100644
index 0000000000..424fa66ff6
--- /dev/null
+++ b/examples/bluetooth/blufi/sdkconfig.ci.nimble
@@ -0,0 +1,3 @@
+CONFIG_BT_ENABLED=y
+CONFIG_BT_NIMBLE_ENABLED=y
+CONFIG_BT_NIMBLE_BLUFI_ENABLE=y
diff --git a/examples/bluetooth/esp_hid_device/sdkconfig.ci.nimble b/examples/bluetooth/esp_hid_device/sdkconfig.ci.nimble
new file mode 100644
index 0000000000..a22d8109d7
--- /dev/null
+++ b/examples/bluetooth/esp_hid_device/sdkconfig.ci.nimble
@@ -0,0 +1,2 @@
+CONFIG_BT_ENABLED=y
+CONFIG_BT_NIMBLE_ENABLED=y
diff --git a/examples/bluetooth/esp_hid_host/sdkconfig.ci.nimble b/examples/bluetooth/esp_hid_host/sdkconfig.ci.nimble
new file mode 100644
index 0000000000..a22d8109d7
--- /dev/null
+++ b/examples/bluetooth/esp_hid_host/sdkconfig.ci.nimble
@@ -0,0 +1,2 @@
+CONFIG_BT_ENABLED=y
+CONFIG_BT_NIMBLE_ENABLED=y