diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 70be7c34e..03e49883f 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -24,6 +24,14 @@ default_envs =
 ;                tasmota-sensors
 ;                tasmota-display
 ;                tasmota-ir
+;                tasmota32
+;                tasmota32-minimal
+;                tasmota32-lite
+;                tasmota32-knx
+;                tasmota32-sensors
+;                tasmota32-display
+;                tasmota32-ir
+;                tasmota32-ircustom
 
 
 [common]
@@ -70,9 +78,6 @@ extra_scripts             = ${scripts_defaults.extra_scripts}
 
 [core_active]
 ; Select one core set for platform and build_flags
-;platform                  = ${core_2_6_1.platform}
-;platform_packages         = ${core_2_6_1.platform_packages}
-;build_flags               = ${core_2_6_1.build_flags}
 
 ;platform                  = ${core_2_6_3.platform}
 ;platform_packages         = ${core_2_6_3.platform_packages}
@@ -87,51 +92,6 @@ build_flags               = ${tasmota_feature_stage.build_flags}
 ;build_flags               = ${core_stage.build_flags}
 
 
-[core_2_6_1]
-; *** Esp8266 core for Arduino version 2.6.1
-platform                  = espressif8266@2.3.0
-platform_packages         =
-build_flags               = ${esp82xx_defaults.build_flags}
-                            -Wl,-Teagle.flash.1m.ld
-                            -DBEARSSL_SSL_BASIC
-; NONOSDK221
-;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
-; NONOSDK22x_190313
-;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313
-; NONOSDK22x_190703 = 2.2.1+100-dev(38a443e) (Tasmota default) (Firmware 2K smaller than NONOSDK22x_191105)
-                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
-; NONOSDK22x_191024 = 2.2.1+111-dev(5ab15d1)
-;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024
-; NONOSDK22x_191105 = 2.2.1+113-dev(bb83b9b)
-;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105
-; NONOSDK3V0 (known issues)
-;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3
-; lwIP 1.4
-;                            -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
-; lwIP 2 - Low Memory
-;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-; lwIP 2 - Higher Bandwidth
-;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
-; lwIP 2 - Higher Bandwidth Low Memory no Features
-;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH
-; lwIP 2 - Higher Bandwidth no Features (Tasmota default)
-                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
-; lwIP 2 - Higher Bandwidth IPv6 (use ONLY if you need IPv6, experimental!)
-;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_IPV6_HIGHER_BANDWIDTH
-; VTABLES in Flash (Tasmota default)
-                            -DVTABLES_IN_FLASH
-; VTABLES in Heap
-;                            -DVTABLES_IN_DRAM
-; VTABLES in IRAM
-;                            -DVTABLES_IN_IRAM
-; enable one option set -> No exception recommended
-; No exception code in firmware
-                            -fno-exceptions
-                            -lstdc++
-; Exception code in firmware /needs much space! 90k
-;                           -fexceptions
-;                           -lstdc++-exc
-
 [core_2_6_3]
 ; *** Esp8266 core for Arduino version 2.6.3
 platform                  = espressif8266@2.4.0
@@ -268,3 +228,42 @@ build_flags               = ${esp82xx_defaults.build_flags}
 ; *** Debug version used for PlatformIO Home Project Inspection
 [env:tasmota-debug]
 build_type = debug
+
+
+; ***        Experimental ESP32 Tasmota version               ***
+; ***  expect the unexpected. Many features not working!!!    ***
+
+[common32]
+platform                = espressif32@1.12.0
+platform_packages       =
+board                   = wemos_d1_mini32
+board_build.ldscript    = esp32_out.ld
+board_build.flash_mode  = ${common.board_build.flash_mode}
+board_build.f_cpu       = ${common.board_build.f_cpu}
+build_unflags           = ${common.build_unflags}
+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 =
+    -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
+;    -D USE_CONFIG_OVERRIDE
+
+lib_extra_dirs =
+    libesp32
+
+lib_ignore =
+    ILI9488
+    SSD3115
+    cc1101