diff --git a/platformio.ini b/platformio.ini
index b5bce215..b1dd2367 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -67,6 +67,7 @@ lib_deps =
   file://arch/esp32/AsyncElegantOTA
 
 ; esp32c6 uses arduino framework 3.x
+; WARNING: experimental. pioarduino on esp32c6 needs work - it's not considered stable and has issues.
 [esp32c6_base]
 extends = esp32_base
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.12/platform-espressif32.zip
diff --git a/variants/heltec_e213/platformio.ini b/variants/heltec_e213/platformio.ini
index 74598a2d..93bdc000 100644
--- a/variants/heltec_e213/platformio.ini
+++ b/variants/heltec_e213/platformio.ini
@@ -40,7 +40,7 @@ lib_deps =
   ${esp32_base.lib_deps}
   https://github.com/Quency-D/heltec-eink-modules/archive/563dd41fd850a1bc3039b8723da4f3a20fe1c800.zip
 
-[env:Heltec_E213_companion_radio_ble]
+[env:Heltec_E213_companion_radio_ble_]
 extends = Heltec_E213_base
 build_flags =
   ${Heltec_E213_base.build_flags}
@@ -60,7 +60,7 @@ lib_deps =
   ${Heltec_E213_base.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Heltec_E213_companion_radio_usb]
+[env:Heltec_E213_companion_radio_usb_]
 extends = Heltec_E213_base
 build_flags =
   ${Heltec_E213_base.build_flags}
@@ -78,7 +78,7 @@ lib_deps =
   ${Heltec_E213_base.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Heltec_E213_repeater]
+[env:Heltec_E213_repeater_]
 extends = Heltec_E213_base
 build_flags =
   ${Heltec_E213_base.build_flags}
@@ -95,7 +95,7 @@ lib_deps =
   ${Heltec_E213_base.lib_deps}
   ${esp32_ota.lib_deps}
 
-; [env:Heltec_E213_repeater_bridge_rs232]
+; [env:Heltec_E213_repeater_bridge_rs232_]
 ; extends = Heltec_E213_base
 ; build_flags =
 ;   ${Heltec_E213_base.build_flags}
@@ -119,7 +119,7 @@ lib_deps =
 ;   ${Heltec_E213_base.lib_deps}
 ;   ${esp32_ota.lib_deps}
 
-[env:Heltec_E213_repeater_bridge_espnow]
+[env:Heltec_E213_repeater_bridge_espnow_]
 extends = Heltec_E213_base
 build_flags =
   ${Heltec_E213_base.build_flags}
@@ -141,7 +141,7 @@ lib_deps =
   ${Heltec_E213_base.lib_deps}
   ${esp32_ota.lib_deps}
 
-[env:Heltec_E213_room_server]
+[env:Heltec_E213_room_server_]
 extends = Heltec_E213_base
 build_flags =
   ${Heltec_E213_base.build_flags}
diff --git a/variants/heltec_e290/platformio.ini b/variants/heltec_e290/platformio.ini
index 3289c975..201b3631 100644
--- a/variants/heltec_e290/platformio.ini
+++ b/variants/heltec_e290/platformio.ini
@@ -34,7 +34,7 @@ lib_deps =
   ${esp32_base.lib_deps}
   https://github.com/Quency-D/heltec-eink-modules/archive/563dd41fd850a1bc3039b8723da4f3a20fe1c800.zip
 
-[env:Heltec_E290_companion_radio_ble]
+[env:Heltec_E290_companion_ble_]
 extends = Heltec_E290_base
 build_flags =
   ${Heltec_E290_base.build_flags}
@@ -54,7 +54,7 @@ lib_deps =
   ${Heltec_E290_base.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Heltec_E290_companion_radio_usb]
+[env:Heltec_E290_companion_usb_]
 extends = Heltec_E290_base
 build_flags =
   ${Heltec_E290_base.build_flags}
@@ -74,7 +74,7 @@ lib_deps =
   ${Heltec_E290_base.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Heltec_E290_repeater]
+[env:Heltec_E290_repeater_]
 extends = Heltec_E290_base
 build_flags =
   ${Heltec_E290_base.build_flags}
@@ -91,7 +91,7 @@ lib_deps =
   ${Heltec_E290_base.lib_deps}
   ${esp32_ota.lib_deps}
 
-; [env:Heltec_E290_repeater_bridge_rs232]
+; [env:Heltec_E290_repeater_bridge_rs232_]
 ; extends = Heltec_E290_base
 ; build_flags =
 ;   ${Heltec_E290_base.build_flags}
@@ -115,7 +115,7 @@ lib_deps =
 ;   ${Heltec_E290_base.lib_deps}
 ;   ${esp32_ota.lib_deps}
 
-[env:Heltec_E290_repeater_bridge_espnow]
+[env:Heltec_E290_repeater_bridge_espnow_]
 extends = Heltec_E290_base
 build_flags =
   ${Heltec_E290_base.build_flags}
@@ -137,7 +137,7 @@ lib_deps =
   ${Heltec_E290_base.lib_deps}
   ${esp32_ota.lib_deps}
 
-[env:Heltec_E290_room_server]
+[env:Heltec_E290_room_server_]
 extends = Heltec_E290_base
 build_flags =
   ${Heltec_E290_base.build_flags}
diff --git a/variants/heltec_t190/platformio.ini b/variants/heltec_t190/platformio.ini
index 72a40dec..01e9dfc9 100644
--- a/variants/heltec_t190/platformio.ini
+++ b/variants/heltec_t190/platformio.ini
@@ -47,7 +47,7 @@ lib_deps =
   ${esp32_base.lib_deps}
   adafruit/Adafruit GFX Library @ ^1.12.1
 
-[env:Heltec_T190_companion_radio_ble]
+[env:Heltec_T190_companion_radio_ble_]
 extends = Heltec_T190_base
 build_flags =
   ${Heltec_T190_base.build_flags}
@@ -65,7 +65,7 @@ lib_deps =
   ${Heltec_T190_base.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Heltec_T190_companion_radio_usb]
+[env:Heltec_T190_companion_radio_usb_]
 extends = Heltec_T190_base
 build_flags =
   ${Heltec_T190_base.build_flags}
@@ -81,7 +81,7 @@ lib_deps =
   ${Heltec_T190_base.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Heltec_T190_repeater]
+[env:Heltec_T190_repeater_]
 extends = Heltec_T190_base
 build_flags =
   ${Heltec_T190_base.build_flags}
@@ -96,7 +96,7 @@ lib_deps =
   ${Heltec_T190_base.lib_deps}
   ${esp32_ota.lib_deps}
 
-; [env:Heltec_T190_repeater_bridge_rs232]
+; [env:Heltec_T190_repeater_bridge_rs232_]
 ; extends = Heltec_T190_base
 ; build_flags =
 ;   ${Heltec_T190_base.build_flags}
@@ -118,7 +118,7 @@ lib_deps =
 ;   ${Heltec_T190_base.lib_deps}
 ;   ${esp32_ota.lib_deps}
 
-[env:Heltec_T190_repeater_bridge_espnow]
+[env:Heltec_T190_repeater_bridge_espnow_]
 extends = Heltec_T190_base
 build_flags =
   ${Heltec_T190_base.build_flags}
@@ -138,7 +138,7 @@ lib_deps =
   ${Heltec_T190_base.lib_deps}
   ${esp32_ota.lib_deps}
 
-[env:Heltec_T190_room_server]
+[env:Heltec_T190_room_server_]
 extends = Heltec_T190_base
 build_flags =
   ${Heltec_T190_base.build_flags}
diff --git a/variants/lilygo_tlora_c6/platformio.ini b/variants/lilygo_tlora_c6/platformio.ini
index 308c85eb..88a811b5 100644
--- a/variants/lilygo_tlora_c6/platformio.ini
+++ b/variants/lilygo_tlora_c6/platformio.ini
@@ -30,7 +30,7 @@ build_flags =
 build_src_filter = ${esp32c6_base.build_src_filter}
   +<../variants/lilygo_tlora_c6>
 
-[env:LilyGo_Tlora_C6_repeater]
+[env:LilyGo_Tlora_C6_repeater_]
 extends = tlora_c6
 build_src_filter = ${tlora_c6.build_src_filter}
   +<../examples/simple_repeater/*.cpp>
@@ -47,7 +47,7 @@ lib_deps =
   ${tlora_c6.lib_deps}
 ;  ${esp32_ota.lib_deps}
 
-[env:LilyGo_Tlora_C6_room_server]
+[env:LilyGo_Tlora_C6_room_server_]
 extends = tlora_c6
 build_src_filter = ${tlora_c6.build_src_filter}
   +<../examples/simple_room_server>
@@ -64,7 +64,7 @@ lib_deps =
   ${tlora_c6.lib_deps}
 ;  ${esp32_ota.lib_deps}
 
-[env:LilyGo_Tlora_C6_companion_radio_ble]
+[env:LilyGo_Tlora_C6_companion_radio_ble_]
 extends = tlora_c6
 build_flags = ${tlora_c6.build_flags}
   -D MAX_CONTACTS=300
diff --git a/variants/xiao_c6/platformio.ini b/variants/xiao_c6/platformio.ini
index 6e963432..9c971083 100644
--- a/variants/xiao_c6/platformio.ini
+++ b/variants/xiao_c6/platformio.ini
@@ -30,7 +30,7 @@ build_src_filter = ${esp32c6_base.build_src_filter}
   +<../variants/xiao_c6>
   +<XiaoC6Board.cpp>
 
-[env:Xiao_C6_repeater]
+[env:Xiao_C6_repeater_]
 extends = Xiao_C6
 build_src_filter = ${Xiao_C6.build_src_filter}
   +<../examples/simple_repeater/*.cpp>
@@ -47,7 +47,7 @@ lib_deps =
   ${Xiao_C6.lib_deps}
 ;  ${esp32_ota.lib_deps}
 
-[env:Xiao_C6_companion_radio_ble]
+[env:Xiao_C6_companion_radio_ble_]
 extends = Xiao_C6
 build_flags = ${Xiao_C6.build_flags}
   -D MAX_CONTACTS=300
@@ -90,10 +90,10 @@ build_flags =
   -D SX126X_RX_BOOSTED_GAIN=1
   -D USE_XIAO_ESP32C6_EXTERNAL_ANTENNA=1
 
-[env:Meshimi_repeater]
+[env:Meshimi_repeater_]
 extends = Meshimi
 build_src_filter = ${Meshimi.build_src_filter}
-                   +<../examples/simple_repeater/*.cpp>
+  +<../examples/simple_repeater/*.cpp>
 build_flags =
   ${Meshimi.build_flags}
   -D ADVERT_NAME='"Meshimi Repeater"'
@@ -104,7 +104,7 @@ build_flags =
 lib_deps =
   ${Meshimi.lib_deps}
 
-[env:Meshimi_companion_radio_ble]
+[env:Meshimi_companion_radio_ble_]
 extends = Meshimi
 build_flags = ${Meshimi.build_flags}
   -D MAX_CONTACTS=300
@@ -115,9 +115,9 @@ build_flags = ${Meshimi.build_flags}
   -D ENABLE_PRIVATE_KEY_IMPORT=1
   -D ENABLE_PRIVATE_KEY_EXPORT=1
 build_src_filter = ${Meshimi.build_src_filter}
-                   +<helpers/esp32/*.cpp>
-                   -<helpers/esp32/ESPNOWRadio.cpp>
-                   +<../examples/companion_radio/*.cpp>
+  +<helpers/esp32/*.cpp>
+  -<helpers/esp32/ESPNOWRadio.cpp>
+  +<../examples/companion_radio/*.cpp>
 lib_deps =
   ${Meshimi.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -147,7 +147,7 @@ build_flags =
   -USX126X_DIO2_AS_RF_SWITCH
   -USX126X_DIO3_TCXO_VOLTAGE
 
-[env:WHY2025_badge_repeater]
+[env:WHY2025_badge_repeater_]
 extends = WHY2025_badge
 build_src_filter = ${WHY2025_badge.build_src_filter}
   +<../examples/simple_repeater/*.cpp>
@@ -164,7 +164,7 @@ lib_deps =
   ${WHY2025_badge.lib_deps}
 ;  ${esp32_ota.lib_deps}
 
-[env:WHY2025_badge_companion_radio_ble]
+[env:WHY2025_badge_companion_radio_ble_]
 extends = WHY2025_badge
 build_flags = ${WHY2025_badge.build_flags}
   -D MAX_CONTACTS=300