diff --git a/variants/diy/platformio.ini b/variants/diy/platformio.ini
index d50d0c4f..61203571 100644
--- a/variants/diy/platformio.ini
+++ b/variants/diy/platformio.ini
@@ -11,7 +11,7 @@ build_flags =
   -I variants/diy/v1
 
 ; Meshtastic DIY v1.1 new schematic based on ESP32-WROOM-32 & SX1262/SX1268 modules
-[env:meshtastic-diy-v1.1]
+[env:meshtastic-diy-v1_1]
 extends = esp32_base
 board = esp32doit-devkit-v1
 board_level = extra
diff --git a/variants/heltec_v2.1/platformio.ini b/variants/heltec_v2.1/platformio.ini
index 792a1bb9..29f544f7 100644
--- a/variants/heltec_v2.1/platformio.ini
+++ b/variants/heltec_v2.1/platformio.ini
@@ -1,4 +1,4 @@
-[env:heltec-v2.1]
+[env:heltec-v2_1]
 ;build_type = debug ; to make it possible to step through our jtag debugger 
 extends = esp32_base
 board = heltec_wifi_lora_32_V2
diff --git a/variants/heltec_v2/platformio.ini b/variants/heltec_v2/platformio.ini
index 8a60942a..3289f4e6 100644
--- a/variants/heltec_v2/platformio.ini
+++ b/variants/heltec_v2/platformio.ini
@@ -1,4 +1,4 @@
-[env:heltec-v2.0]
+[env:heltec-v2_0]
 ;build_type = debug ; to make it possible to step through our jtag debugger 
 extends = esp32_base
 board = heltec_wifi_lora_32_V2
diff --git a/variants/tbeam_v07/platformio.ini b/variants/tbeam_v07/platformio.ini
index 22258b64..5428b0e2 100644
--- a/variants/tbeam_v07/platformio.ini
+++ b/variants/tbeam_v07/platformio.ini
@@ -1,5 +1,5 @@
 ; The original TBEAM board without the AXP power chip and a few other changes
-[env:tbeam0.7]
+[env:tbeam0_7]
 extends = esp32_base
 board = ttgo-t-beam
 board_level = extra
diff --git a/variants/tlora_v2_1_16/platformio.ini b/variants/tlora_v2_1_16/platformio.ini
index 84ffc1ea..da2a32ce 100644
--- a/variants/tlora_v2_1_16/platformio.ini
+++ b/variants/tlora_v2_1_16/platformio.ini
@@ -1,4 +1,4 @@
-[env:tlora-v2-1-1.6]
+[env:tlora-v2-1-1_6]
 extends = esp32_base
 board = ttgo-lora32-v21
 build_flags = 
diff --git a/variants/tlora_v2_1_18/platformio.ini b/variants/tlora_v2_1_18/platformio.ini
index 01741ca1..36d6a315 100644
--- a/variants/tlora_v2_1_18/platformio.ini
+++ b/variants/tlora_v2_1_18/platformio.ini
@@ -1,4 +1,4 @@
-[env:tlora-v2-1-1.8]
+[env:tlora-v2-1-1_8]
 extends = esp32_base
 board = ttgo-lora32-v21