diff --git a/pio/gzip-firmware.py b/pio/gzip-firmware.py
index 43af1f933..248bb5a02 100644
--- a/pio/gzip-firmware.py
+++ b/pio/gzip-firmware.py
@@ -6,7 +6,7 @@ import gzip
 OUTPUT_DIR = "build_output{}".format(os.path.sep)
 
 def bin_gzip(source, target, env):
-    variant = str(target[0]).split(os.path.sep)[1]
+    variant = str(target[0]).split(os.path.sep)[2]
     
     # create string with location and file names based on variant
     bin_file = "{}firmware{}{}.bin".format(OUTPUT_DIR, os.path.sep, variant)
diff --git a/pio/name-firmware.py b/pio/name-firmware.py
index 1490ecc5c..1c79056de 100644
--- a/pio/name-firmware.py
+++ b/pio/name-firmware.py
@@ -5,7 +5,7 @@ import shutil
 OUTPUT_DIR = "build_output{}".format(os.path.sep)
 
 def bin_map_copy(source, target, env):
-    variant = str(target[0]).split(os.path.sep)[1]
+    variant = str(target[0]).split(os.path.sep)[2]
     
     # check if output directories exist and create if necessary
     if not os.path.isdir(OUTPUT_DIR):
diff --git a/platformio.ini b/platformio.ini
index ecf7d41ab..a0c4d82b5 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -7,18 +7,9 @@
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/en/stable/projectconf.html
 
-[platformio]
-description = Provide ESP8266 based devices with Web, MQTT and OTA firmware
-src_dir = tasmota
-build_dir = .pioenvs
-workspace_dir = .pioenvs
-build_cache_dir = .cache
-extra_configs = platformio_tasmota32.ini
-                platformio_tasmota_env.ini
-                platformio_tasmota_env32.ini
-                platformio_override.ini
 
-; *** Build/upload environment
+; *** Tasmota build variant selection
+[build_envs]
 default_envs =
 ; *** Uncomment by deleting ";" in the line(s) below to select version(s)
 ;                tasmota
@@ -53,10 +44,21 @@ default_envs =
 ;                tasmota-TW
 ;                tasmota-UK
 ;
+; *** Selection for Tasmota ESP32 is done in platformio_tasmota32.ini
+;
 ; *** alternatively can be done in: platformio_override.ini
 ; *** See example: platformio_override_sample.ini
 ; *********************************************************************
 
+[platformio]
+description = Provide ESP8266 / ESP32 based devices with Web, MQTT and OTA firmware
+src_dir = tasmota
+build_cache_dir = .cache
+extra_configs = platformio_tasmota32.ini
+                platformio_tasmota_env.ini
+                platformio_tasmota_env32.ini
+                platformio_override.ini
+default_envs =  ${build_envs.default_envs}
 
 [common]
 framework                 = arduino
diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
index feca8c849..739ec2338 100644
--- a/platformio_tasmota32.ini
+++ b/platformio_tasmota32.ini
@@ -1,8 +1,46 @@
 ; ***              BETA ESP32 Tasmota version                 ***
 ; ***  expect the unexpected. Some features not working!!!    ***
 
+[platformio]
+
+; *** Tasmota build variant selection
+default_envs =  ${build_envs.default_envs}
+; *** Uncomment by deleting ";" in the line(s) below to select version(s)
+;                tasmota32
+;                tasmota32-webcam
+;                tasmota32-minimal
+;                tasmota32-lite
+;                tasmota32-knx
+;                tasmota32-sensors
+;                tasmota32-display
+;                tasmota32-ir
+;                tasmota32-ircustom
+;                tasmota32-BG
+;                tasmota32-BR
+;                tasmota32-CN
+;                tasmota32-CZ
+;                tasmota32-DE
+;                tasmota32-ES
+;                tasmota32-FR
+;                tasmota32-GR
+;                tasmota32-HE
+;                tasmota32-HU
+;                tasmota32-IT
+;                tasmota32-KO
+;                tasmota32-NL
+;                tasmota32-PL
+;                tasmota32-PT
+;                tasmota32-RO
+;                tasmota32-RU
+;                tasmota32-SE
+;                tasmota32-SK
+;                tasmota32-TR
+;                tasmota32-TW
+;                tasmota32-UK
+
+
 [common32]
-platform                = espressif32@1.12.4
+platform                = espressif32@2.0.0
 platform_packages       = tool-esptoolpy@1.20800.0
 board                   = esp32dev
 board_build.ldscript    = esp32_out.ld