diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in
index 2e7a2a7a3f..ef9ee0c894 100644
--- a/components/bt/host/nimble/Kconfig.in
+++ b/components/bt/host/nimble/Kconfig.in
@@ -674,7 +674,7 @@ config BT_NIMBLE_VS_SUPPORT
 
 config BT_NIMBLE_ENC_ADV_DATA
     bool "Encrypted Advertising Data"
-    depends on SOC_ESP_NIMBLE_CONTROLLER && BT_NIMBLE_50_FEATURE_SUPPORT
+    depends on BT_NIMBLE_50_FEATURE_SUPPORT
     select BT_NIMBLE_EXT_ADV
     help
         This option is used to enable encrypted advertising data.
diff --git a/examples/bluetooth/.build-test-rules.yml b/examples/bluetooth/.build-test-rules.yml
index 1e467123ac..92df568e2c 100644
--- a/examples/bluetooth/.build-test-rules.yml
+++ b/examples/bluetooth/.build-test-rules.yml
@@ -95,9 +95,9 @@ examples/bluetooth/nimble:
 
 examples/bluetooth/nimble/ble_enc_adv_data:
   enable:
-    - if: IDF_TARGET in ["esp32c2", "esp32c3", "esp32s3"]
+    - if: SOC_BLE_SUPPORTED == 1 and IDF_TARGET != "esp32"
       temporary: true
-      reason: the other targets are not tested yet
+      reason: BLE 5.0 not supported on esp32
 
 examples/bluetooth/nimble/ble_htp:
   enable:
diff --git a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/README.md b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/README.md
index e264b51ed2..9a00211afc 100644
--- a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/README.md
+++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-S3 |
-| ----------------- | -------- | -------- | -------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-H2 | ESP32-S3 |
+| ----------------- | -------- | -------- | -------- | -------- |
 
 # BLE Encrypted Advertising Data Central Example
 
diff --git a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/main/Kconfig.projbuild
index 0e5c38d145..7867675a2c 100644
--- a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/main/Kconfig.projbuild
+++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/main/Kconfig.projbuild
@@ -8,8 +8,8 @@ menu "Example Configuration"
 
     config EXAMPLE_ENC_ADV_DATA
         bool
-        depends on SOC_ESP_NIMBLE_CONTROLLER && BT_NIMBLE_50_FEATURE_SUPPORT
         prompt "Enable encrypted advertising data feature support"
+        depends on BT_NIMBLE_50_FEATURE_SUPPORT
         default y
         select BT_NIMBLE_ENC_ADV_DATA
         help
diff --git a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/README.md b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/README.md
index 790724772b..68907c05ab 100644
--- a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/README.md
+++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-S3 |
-| ----------------- | -------- | -------- | -------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-H2 | ESP32-S3 |
+| ----------------- | -------- | -------- | -------- | -------- |
 
 
 # BLE Encrypted Advertising Data Peripheral Example
diff --git a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/Kconfig.projbuild b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/Kconfig.projbuild
index c304f3182f..be90b080c5 100644
--- a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/Kconfig.projbuild
+++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/Kconfig.projbuild
@@ -56,7 +56,7 @@ menu "Example Configuration"
     config EXAMPLE_ENC_ADV_DATA
         bool
         prompt "Enable encrypted advertising data feature support"
-        depends on SOC_ESP_NIMBLE_CONTROLLER && BT_NIMBLE_50_FEATURE_SUPPORT
+        depends on BT_NIMBLE_50_FEATURE_SUPPORT
         default y
         select BT_NIMBLE_ENC_ADV_DATA
         help