diff --git a/platformio.ini b/platformio.ini
index 86f72211a..ace3cc6db 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -14,6 +14,7 @@ build_dir = .pioenvs
 workspace_dir = .pioenvs
 build_cache_dir = .cache
 extra_configs = platformio_tasmota_env.ini
+                platformio_tasmota_env32.ini
                 platformio_override.ini
 
 ; *** Build/upload environment
@@ -76,6 +77,46 @@ upload_resetmethod        = nodemcu
 upload_port               = COM5
 extra_scripts             = ${scripts_defaults.extra_scripts}
 
+; ***              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
+    
 [scripts_defaults]
 extra_scripts             = pio/strip-floats.py
                             pio/name-firmware.py