diff --git a/platformio.ini b/platformio.ini
index 86f72211a..ecf7d41ab 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -13,7 +13,9 @@ src_dir = tasmota
 build_dir = .pioenvs
 workspace_dir = .pioenvs
 build_cache_dir = .cache
-extra_configs = platformio_tasmota_env.ini
+extra_configs = platformio_tasmota32.ini
+                platformio_tasmota_env.ini
+                platformio_tasmota_env32.ini
                 platformio_override.ini
 
 ; *** Build/upload environment
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index be5d5f24f..ddd74a60d 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -9,8 +9,7 @@
 ; http://docs.platformio.org/en/stable/projectconf.html
 
 [platformio]
-extra_configs = platformio_tasmota_env32.ini
-                platformio_tasmota_cenv.ini
+extra_configs = platformio_tasmota_cenv.ini
 
 ; *** Build/upload environment
 default_envs =
@@ -167,44 +166,3 @@ build_type                = debug
 build_unflags             = ${esp_defaults.build_unflags}
 build_flags               = ${esp82xx_defaults.build_flags}
                             -Wstack-usage=300
-
-
-; ***        Experimental ESP32 Tasmota version               ***
-; ***  expect the unexpected. Many features not working!!!    ***
-
-[common32]
-platform                = espressif32@1.12.4
-platform_packages       = tool-esptoolpy@1.20800.0
-board                   = esp32dev
-board_build.ldscript    = esp32_out.ld
-board_build.partitions  = esp32_partition_app1984k_spiffs64k.csv
-board_build.flash_mode  = ${common.board_build.flash_mode}
-board_build.f_flash     = ${common.board_build.f_flash}
-board_build.f_cpu       = ${common.board_build.f_cpu}
-build_unflags           = ${esp_defaults.build_unflags}
-                          -Wpointer-arith
-monitor_speed           = ${common.monitor_speed}
-upload_port             = ${common.upload_port}
-upload_resetmethod      = ${common.upload_resetmethod}
-upload_speed            = 921600
-extra_scripts           = ${common.extra_scripts}
-
-build_flags             = ${esp_defaults.build_flags}
-
-    -D CORE_DEBUG_LEVEL=0
-    -D BUFFER_LENGTH=128
-    -D MQTT_MAX_PACKET_SIZE=1200
-    -D uint32=uint32_t
-    -D uint16=uint16_t
-    -D uint8=uint8_t
-    -D sint8_t=int8_t
-    -D sint32_t=int32_t
-    -D sint16_t=int16_t
-    -D memcpy_P=memcpy
-	  -D memcmp_P=memcmp
-
-lib_extra_dirs =
-    libesp32
-
-lib_ignore =
-    cc1101
diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
new file mode 100644
index 000000000..feca8c849
--- /dev/null
+++ b/platformio_tasmota32.ini
@@ -0,0 +1,39 @@
+; ***              BETA ESP32 Tasmota version                 ***
+; ***  expect the unexpected. Some features not working!!!    ***
+
+[common32]
+platform                = espressif32@1.12.4
+platform_packages       = tool-esptoolpy@1.20800.0
+board                   = esp32dev
+board_build.ldscript    = esp32_out.ld
+board_build.partitions  = esp32_partition_app1984k_spiffs64k.csv
+board_build.flash_mode  = ${common.board_build.flash_mode}
+board_build.f_flash     = ${common.board_build.f_flash}
+board_build.f_cpu       = ${common.board_build.f_cpu}
+build_unflags           = ${esp_defaults.build_unflags}
+                          -Wpointer-arith
+monitor_speed           = ${common.monitor_speed}
+upload_port             = ${common.upload_port}
+upload_resetmethod      = ${common.upload_resetmethod}
+upload_speed            = 921600
+extra_scripts           = ${common.extra_scripts}
+
+build_flags             = ${esp_defaults.build_flags}
+
+    -D CORE_DEBUG_LEVEL=0
+    -D BUFFER_LENGTH=128
+    -D MQTT_MAX_PACKET_SIZE=1200
+    -D uint32=uint32_t
+    -D uint16=uint16_t
+    -D uint8=uint8_t
+    -D sint8_t=int8_t
+    -D sint32_t=int32_t
+    -D sint16_t=int16_t
+    -D memcpy_P=memcpy
+	  -D memcmp_P=memcmp
+
+lib_extra_dirs =
+    libesp32
+
+lib_ignore =
+    cc1101