diff --git a/boards/adafruit_feather_esp32s3.json b/boards/adafruit_feather_esp32s3.json
index 5796b0559..f668544b9 100644
--- a/boards/adafruit_feather_esp32s3.json
+++ b/boards/adafruit_feather_esp32s3.json
@@ -33,6 +33,7 @@
     "variant": "adafruit_feather_esp32s3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/adafruit_feather_esp32s3_nopsram.json b/boards/adafruit_feather_esp32s3_nopsram.json
index 79ee24d1d..b38d0f808 100644
--- a/boards/adafruit_feather_esp32s3_nopsram.json
+++ b/boards/adafruit_feather_esp32s3_nopsram.json
@@ -33,6 +33,7 @@
     "variant": "adafruit_feather_esp32s3_nopsram"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/adafruit_feather_esp32s3_reversetft.json b/boards/adafruit_feather_esp32s3_reversetft.json
index fc3b8bc36..de9a8e53f 100644
--- a/boards/adafruit_feather_esp32s3_reversetft.json
+++ b/boards/adafruit_feather_esp32s3_reversetft.json
@@ -33,6 +33,7 @@
     "variant": "adafruit_feather_esp32s3_reversetft"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/adafruit_feather_esp32s3_tft.json b/boards/adafruit_feather_esp32s3_tft.json
index dbf7612bd..0b1d9433f 100644
--- a/boards/adafruit_feather_esp32s3_tft.json
+++ b/boards/adafruit_feather_esp32s3_tft.json
@@ -32,6 +32,7 @@
     "variant": "adafruit_feather_esp32s3_tft"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/adafruit_matrixportal_esp32s3.json b/boards/adafruit_matrixportal_esp32s3.json
index 3446cd217..df10505ad 100644
--- a/boards/adafruit_matrixportal_esp32s3.json
+++ b/boards/adafruit_matrixportal_esp32s3.json
@@ -33,6 +33,7 @@
     "variant": "adafruit_matrixportal_esp32s3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/adafruit_qtpy_esp32s3_nopsram.json b/boards/adafruit_qtpy_esp32s3_nopsram.json
index 15589da92..989ca7837 100644
--- a/boards/adafruit_qtpy_esp32s3_nopsram.json
+++ b/boards/adafruit_qtpy_esp32s3_nopsram.json
@@ -32,6 +32,7 @@
     "variant": "adafruit_qtpy_esp32s3_nopsram"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/arduino_nano_esp32.json b/boards/arduino_nano_esp32.json
index c6da4e227..e1bf757d5 100644
--- a/boards/arduino_nano_esp32.json
+++ b/boards/arduino_nano_esp32.json
@@ -30,6 +30,7 @@
     "variant": "arduino_nano_nora"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/bee_motion_s3.json b/boards/bee_motion_s3.json
index c1cae0fd0..505986103 100644
--- a/boards/bee_motion_s3.json
+++ b/boards/bee_motion_s3.json
@@ -23,6 +23,7 @@
     "variant": "Bee_Motion_S3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/bee_s3.json b/boards/bee_s3.json
index 16e47ee79..98e966369 100644
--- a/boards/bee_s3.json
+++ b/boards/bee_s3.json
@@ -23,6 +23,7 @@
     "variant": "Bee_S3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/bpi_leaf_s3.json b/boards/bpi_leaf_s3.json
index c1d8a154c..62cc90ee9 100644
--- a/boards/bpi_leaf_s3.json
+++ b/boards/bpi_leaf_s3.json
@@ -24,6 +24,7 @@
     "variant": "bpi_leaf_s3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/cytron_maker_feather_aiot_s3.json b/boards/cytron_maker_feather_aiot_s3.json
index 4b7a2704c..839a54be3 100644
--- a/boards/cytron_maker_feather_aiot_s3.json
+++ b/boards/cytron_maker_feather_aiot_s3.json
@@ -26,6 +26,7 @@
     "variant": "cytron_maker_feather_aiot_s3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/dfrobot_firebeetle2_esp32s3.json b/boards/dfrobot_firebeetle2_esp32s3.json
index 0f87150d6..c1997db4e 100644
--- a/boards/dfrobot_firebeetle2_esp32s3.json
+++ b/boards/dfrobot_firebeetle2_esp32s3.json
@@ -27,6 +27,7 @@
     "variant": "dfrobot_firebeetle2_esp32s3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/dfrobot_romeo_esp32s3.json b/boards/dfrobot_romeo_esp32s3.json
index 63a7cb472..55e69db5c 100644
--- a/boards/dfrobot_romeo_esp32s3.json
+++ b/boards/dfrobot_romeo_esp32s3.json
@@ -25,6 +25,7 @@
     "variant": "dfrobot_romeo_esp32s3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/edgebox-esp-100.json b/boards/edgebox-esp-100.json
index 22aee2f8b..d00074d0c 100644
--- a/boards/edgebox-esp-100.json
+++ b/boards/edgebox-esp-100.json
@@ -18,6 +18,7 @@
     "variant": "Edgebox-ESP-100"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/esp32-s3-devkitc-1.json b/boards/esp32-s3-devkitc-1.json
index a2f8b22f5..b9c184c4b 100644
--- a/boards/esp32-s3-devkitc-1.json
+++ b/boards/esp32-s3-devkitc-1.json
@@ -24,6 +24,7 @@
     "variant": "esp32s3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/lilygo-t-display-s3.json b/boards/lilygo-t-display-s3.json
index 7230d3bd2..f7647271c 100644
--- a/boards/lilygo-t-display-s3.json
+++ b/boards/lilygo-t-display-s3.json
@@ -26,6 +26,7 @@
     "variant": "lilygo_t_display_s3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/lolin_s3_mini.json b/boards/lolin_s3_mini.json
index ad3794bcb..7f55f0bde 100644
--- a/boards/lolin_s3_mini.json
+++ b/boards/lolin_s3_mini.json
@@ -23,6 +23,7 @@
       "variant": "lolin_s3_mini"
     },
     "connectivity": [
+      "bluetooth",
       "wifi"
     ],
     "debug": {
diff --git a/boards/m5stack-atoms3.json b/boards/m5stack-atoms3.json
index f5e87d3ab..c80ded069 100644
--- a/boards/m5stack-atoms3.json
+++ b/boards/m5stack-atoms3.json
@@ -24,6 +24,7 @@
     "variant": "m5stack_atoms3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/m5stack-cores3.json b/boards/m5stack-cores3.json
index 72571e0b7..069097dcf 100644
--- a/boards/m5stack-cores3.json
+++ b/boards/m5stack-cores3.json
@@ -24,6 +24,7 @@
     "variant": "m5stack_cores3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/m5stack-stamps3.json b/boards/m5stack-stamps3.json
index 6c92e3b5d..31c7f25cd 100644
--- a/boards/m5stack-stamps3.json
+++ b/boards/m5stack-stamps3.json
@@ -24,6 +24,7 @@
     "variant": "m5stack_stamp_s3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/nebulas3.json b/boards/nebulas3.json
index dc6236494..5dd922bea 100644
--- a/boards/nebulas3.json
+++ b/boards/nebulas3.json
@@ -25,6 +25,7 @@
     "variant": "Nebula_S3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/redpill_esp32s3.json b/boards/redpill_esp32s3.json
index 8dff2ff49..c9991e7f2 100644
--- a/boards/redpill_esp32s3.json
+++ b/boards/redpill_esp32s3.json
@@ -25,6 +25,7 @@
     "variant": "redpill_esp32s3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/seeed_xiao_esp32s3.json b/boards/seeed_xiao_esp32s3.json
index cf98a6aa4..5c7171c88 100644
--- a/boards/seeed_xiao_esp32s3.json
+++ b/boards/seeed_xiao_esp32s3.json
@@ -31,6 +31,7 @@
     "variant": "XIAO_ESP32S3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/tamc_termod_s3.json b/boards/tamc_termod_s3.json
index 934c15fb1..0ddc5277e 100644
--- a/boards/tamc_termod_s3.json
+++ b/boards/tamc_termod_s3.json
@@ -26,6 +26,7 @@
     "variant": "tamc_termod_s3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/um_feathers3.json b/boards/um_feathers3.json
index 4430f59b0..1a851fab5 100644
--- a/boards/um_feathers3.json
+++ b/boards/um_feathers3.json
@@ -26,6 +26,7 @@
     "variant": "um_feathers3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/um_pros3.json b/boards/um_pros3.json
index b0b379834..8edcefac3 100644
--- a/boards/um_pros3.json
+++ b/boards/um_pros3.json
@@ -26,6 +26,7 @@
     "variant": "um_pros3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/um_tinys3.json b/boards/um_tinys3.json
index 6a9e3c14c..ed7b2a028 100644
--- a/boards/um_tinys3.json
+++ b/boards/um_tinys3.json
@@ -26,6 +26,7 @@
     "variant": "um_tinys3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/unphone8.json b/boards/unphone8.json
index 3ee0955d9..8dd371a07 100644
--- a/boards/unphone8.json
+++ b/boards/unphone8.json
@@ -20,6 +20,7 @@
     "variant": "unphone8"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/unphone9.json b/boards/unphone9.json
index e269a9662..1b4e8eed4 100644
--- a/boards/unphone9.json
+++ b/boards/unphone9.json
@@ -26,6 +26,7 @@
     "variant": "unphone9"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {
diff --git a/boards/wifiduino32s3.json b/boards/wifiduino32s3.json
index fa8989469..6bef2bd51 100644
--- a/boards/wifiduino32s3.json
+++ b/boards/wifiduino32s3.json
@@ -23,6 +23,7 @@
     "variant": "wifiduino32s3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {