diff --git a/cpu/esp32/Makefile.dep b/cpu/esp32/Makefile.dep
index 43a41b7c9a..329db6b387 100644
--- a/cpu/esp32/Makefile.dep
+++ b/cpu/esp32/Makefile.dep
@@ -24,15 +24,10 @@ ifneq (,$(filter esp_ble,$(USEMODULE)))
   USEMODULE += esp_idf_nvs_flash
   USEMODULE += esp_idf_phy
   USEPKG += esp32_sdk_lib_phy
-  ifeq (esp32,$(CPU_FAM))
-    FEATURES_REQUIRED += esp_ble_esp32
-    USEPKG += esp32_sdk_lib_bt_esp32
-  else ifeq (esp32h2,$(CPU_FAM))
-    FEATURES_REQUIRED += esp_ble_esp32h2
-    USEPKG += esp32_sdk_lib_bt_esp32h2
-  else ifneq (,$(filter esp32c3 esp32s3,$(CPU_FAM)))
-    FEATURES_REQUIRED += esp_ble_esp32c3
+  ifeq (esp32s3,$(CPU_FAM))
     USEPKG += esp32_sdk_lib_bt_esp32c3
+  else
+    USEPKG += esp32_sdk_lib_bt_$(CPU_FAM)
   endif
 endif
 
diff --git a/cpu/esp32/Makefile.features b/cpu/esp32/Makefile.features
index 7c409aa3db..3934a6ac0e 100644
--- a/cpu/esp32/Makefile.features
+++ b/cpu/esp32/Makefile.features
@@ -49,16 +49,10 @@ ifneq (,$(filter esp32 esp32c3 esp32h2 esp32s3,$(CPU_FAM)))
   FEATURES_PROVIDED += ble_nimble
   FEATURES_PROVIDED += ble_nimble_netif
   FEATURES_PROVIDED += esp_ble
-endif
-
-ifeq (esp32,$(CPU_FAM))
-  FEATURES_PROVIDED += esp_ble_esp32
-else ifeq (esp32h2,$(CPU_FAM))
-  FEATURES_PROVIDED += esp_ble_esp32h2
-else ifneq (,$(filter esp32c3 esp32s3,$(CPU_FAM)))
-  FEATURES_PROVIDED += ble_adv_ext
-  FEATURES_PROVIDED += ble_phy_2mbit
-  FEATURES_PROVIDED += esp_ble_esp32c3
+  ifneq (esp32,$(CPU_FAM))
+    FEATURES_PROVIDED += ble_adv_ext
+    FEATURES_PROVIDED += ble_phy_2mbit
+  endif
 endif
 
 ifneq (,$(filter esp32 esp32s3,$(CPU_FAM)))
diff --git a/features.yaml b/features.yaml
index e21f938d65..5f5d619c6d 100644
--- a/features.yaml
+++ b/features.yaml
@@ -152,14 +152,6 @@ groups:
         help: ESP WiFi SoftAP support is present.
       - name: esp_wifi_enterprise
         help: The ESP WiFi interface supports WPA2 enterprise mode.
-      - name: esp_ble_esp32
-        help: The ESP32x SoC uses the SDK Bluetooth LE library for the ESP32
-              variant.
-      - name: esp_ble_esp32c3
-        help: The ESP32x SoC uses the SDK Bluetooth LE library for the ESP32-C3 or
-              ESP32-S3 variant.
-      - name: esp_ble_esp32h2
-        help: The ESP32x SoC uses the SDK Bluetooth LE library for the ESP32-H2 variant.
       - name: esp_hw_counter
         help: The used ESP32x SoC supports HW counters that can be used as timers.
       - name: esp_ieee802154
@@ -177,7 +169,7 @@ groups:
               case additional GPIOs are used for the SPI interface and cannot be
               used for other purposes.
       - name: esp_ble
-        help: An ESP32 Bluetooth LE transceiver is present.
+        help: An ESP32x Bluetooth LE transceiver is present.
     - title: nordic nRF Specific Features
       features:
       - name: radio_nrf802154
diff --git a/makefiles/features_existing.inc.mk b/makefiles/features_existing.inc.mk
index 7e24c402dc..9abfd3b54b 100644
--- a/makefiles/features_existing.inc.mk
+++ b/makefiles/features_existing.inc.mk
@@ -114,9 +114,6 @@ FEATURES_EXISTING := \
     efm32_coretemp \
     emulator_renode \
     esp_ble \
-    esp_ble_esp32 \
-    esp_ble_esp32c3 \
-    esp_ble_esp32h2 \
     esp_hw_counter \
     esp_ieee802154 \
     esp_jtag \
diff --git a/pkg/esp32_sdk_lib_bt_esp32/Makefile.dep b/pkg/esp32_sdk_lib_bt_esp32/Makefile.dep
index 28aab63061..e7c02dbb5a 100644
--- a/pkg/esp32_sdk_lib_bt_esp32/Makefile.dep
+++ b/pkg/esp32_sdk_lib_bt_esp32/Makefile.dep
@@ -1,4 +1,3 @@
 # This package can only be used with the ESP32 CPU
 FEATURES_REQUIRED += arch_esp32
 FEATURES_REQUIRED += esp_ble
-FEATURES_REQUIRED += esp_ble_esp32
diff --git a/pkg/esp32_sdk_lib_bt_esp32c3/Makefile.dep b/pkg/esp32_sdk_lib_bt_esp32c3/Makefile.dep
index f33fadda98..e7c02dbb5a 100644
--- a/pkg/esp32_sdk_lib_bt_esp32c3/Makefile.dep
+++ b/pkg/esp32_sdk_lib_bt_esp32c3/Makefile.dep
@@ -1,4 +1,3 @@
 # This package can only be used with the ESP32 CPU
 FEATURES_REQUIRED += arch_esp32
 FEATURES_REQUIRED += esp_ble
-FEATURES_REQUIRED += esp_ble_esp32c3
diff --git a/pkg/esp32_sdk_lib_bt_esp32h2/Makefile.dep b/pkg/esp32_sdk_lib_bt_esp32h2/Makefile.dep
index e963a049b9..e7c02dbb5a 100644
--- a/pkg/esp32_sdk_lib_bt_esp32h2/Makefile.dep
+++ b/pkg/esp32_sdk_lib_bt_esp32h2/Makefile.dep
@@ -1,4 +1,3 @@
 # This package can only be used with the ESP32 CPU
 FEATURES_REQUIRED += arch_esp32
 FEATURES_REQUIRED += esp_ble
-FEATURES_REQUIRED += esp_ble_esp32h2