diff --git a/boards/esp32c3.json b/boards/esp32c3.json
index e24fac2cc..955589dd3 100644
--- a/boards/esp32c3.json
+++ b/boards/esp32c3.json
@@ -13,7 +13,8 @@
       "partitions": "partitions/esp32_partition_app2880k_fs320k.csv"
     },
     "connectivity": [
-      "wifi"
+      "wifi",
+      "bluetooth"
     ],
     "debug": {
       "openocd_target": "esp32c3.cfg"
diff --git a/boards/esp32c3cdc.json b/boards/esp32c3cdc.json
index 5302b6b4b..648fce5ec 100644
--- a/boards/esp32c3cdc.json
+++ b/boards/esp32c3cdc.json
@@ -13,7 +13,8 @@
       "partitions": "partitions/esp32_partition_app2880k_fs320k.csv"
     },
     "connectivity": [
-      "wifi"
+      "wifi",
+      "bluetooth"
     ],
     "debug": {
       "openocd_target": "esp32c3.cfg"
diff --git a/boards/esp8266_1M.json b/boards/esp8266_1M.json
index 7cd01ec90..6c3327ae7 100644
--- a/boards/esp8266_1M.json
+++ b/boards/esp8266_1M.json
@@ -15,9 +15,7 @@
     "wifi"
   ],
   "frameworks": [
-    "arduino",
-    "esp8266-rtos-sdk",
-    "esp8266-nonos-sdk"
+    "arduino"
   ],
   "name": "Espressif Generic ESP8266 Tasmota 1M sketch NO FS",
   "upload": {
diff --git a/boards/esp8266_2M1M.json b/boards/esp8266_2M1M.json
index afe54a343..3f34da721 100644
--- a/boards/esp8266_2M1M.json
+++ b/boards/esp8266_2M1M.json
@@ -15,9 +15,7 @@
     "wifi"
   ],
   "frameworks": [
-    "arduino",
-    "esp8266-rtos-sdk",
-    "esp8266-nonos-sdk"
+    "arduino"
   ],
   "name": "Espressif Generic ESP8266 Tasmota 1M sketch 1M FS",
   "upload": {
diff --git a/boards/esp8266_2M256.json b/boards/esp8266_2M256.json
index 335b84ade..5ef9e86ae 100644
--- a/boards/esp8266_2M256.json
+++ b/boards/esp8266_2M256.json
@@ -15,9 +15,7 @@
     "wifi"
   ],
   "frameworks": [
-    "arduino",
-    "esp8266-rtos-sdk",
-    "esp8266-nonos-sdk"
+    "arduino"
   ],
   "name": "Espressif Generic ESP8266 Tasmota 1M sketch 772k OTA 256k FS",
   "upload": {
diff --git a/boards/esp8266_4M2M.json b/boards/esp8266_4M2M.json
index 7b0e0c364..9708b2621 100644
--- a/boards/esp8266_4M2M.json
+++ b/boards/esp8266_4M2M.json
@@ -15,9 +15,7 @@
     "wifi"
   ],
   "frameworks": [
-    "arduino",
-    "esp8266-rtos-sdk",
-    "esp8266-nonos-sdk"
+    "arduino"
   ],
   "name": "Espressif Generic ESP8266 Tasmota 1M sketch 1M OTA 2M FS",
   "upload": {
diff --git a/boards/esp8266_4M3M.json b/boards/esp8266_4M3M.json
index fec296cf0..d1fe7e459 100644
--- a/boards/esp8266_4M3M.json
+++ b/boards/esp8266_4M3M.json
@@ -15,9 +15,7 @@
     "wifi"
   ],
   "frameworks": [
-    "arduino",
-    "esp8266-rtos-sdk",
-    "esp8266-nonos-sdk"
+    "arduino"
   ],
   "name": "Espressif Generic ESP8266 Tasmota 1M sketch 3M FS",
   "upload": {
diff --git a/boards/esp8266_zbbridge.json b/boards/esp8266_zbbridge.json
index dbc229004..726b71de3 100644
--- a/boards/esp8266_zbbridge.json
+++ b/boards/esp8266_zbbridge.json
@@ -15,9 +15,7 @@
     "wifi"
   ],
   "frameworks": [
-    "arduino",
-    "esp8266-rtos-sdk",
-    "esp8266-nonos-sdk"
+    "arduino"
   ],
   "name": "Sonoff ZbBridge Tasmota 1M sketch 772k OTA 256k FS",
   "upload": {