diff --git a/boards/esp32s2.json b/boards/esp32s2.json
new file mode 100644
index 000000000..b9142d4c8
--- /dev/null
+++ b/boards/esp32s2.json
@@ -0,0 +1,31 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "esp32s2_out.ld"
+    },
+    "core": "esp32",
+    "mcu": "esp32s2",
+    "extra_flags": "-Desp32S2_dev_module",
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "mcu": "esp32s2",
+    "variant": "esp32s2"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "ESP32S2 Dev Module",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://espressif.com",
+  "vendor": "espressif"
+}
diff --git a/platformio.ini b/platformio.ini
index 12ccfcc90..2b15d8e3b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -56,6 +56,7 @@ default_envs =
 description                 = Provide ESP8266 / ESP32 based devices with Web, MQTT and OTA firmware
 src_dir                     = tasmota
 lib_dir                     = lib/default
+boards_dir                  = boards
 build_cache_dir             = .cache
 extra_configs               = platformio_tasmota32.ini
                               platformio_tasmota_env.ini
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index e6b747c44..f342a31e5 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -10,13 +10,13 @@
 
 [platformio]
 ; For best Gitpod performance remove the ";" in the next line. Needed Platformio files are cached and installed at first run
-core_dir = .platformio
+;core_dir = .platformio
 extra_configs = platformio_tasmota_cenv.ini
 
 ; *** Build/upload environment
 default_envs =
 ; *** Uncomment the line(s) below to select version(s)
-;                tasmota
+                tasmota
 ;                tasmota-debug
 ;                tasmota-ircustom
 ;                tasmota-minimal
@@ -36,7 +36,7 @@ default_envs =
 ;                tasmota32-ir
 ;                tasmota32-ircustom
 ;                tasmota32solo1
-                tasmota32s2
+;                tasmota32s2
 ;                tasmota32-odroidgo
 ;                tasmota32-core2
 
@@ -176,6 +176,7 @@ build_flags                 = ${common32.build_flags}
 ; *** EXPERIMENTAL Tasmota version for ESP32-S2
 [env:tasmota32s2]
 extends                     = env:tasmota32
+board                       = esp32s2
 platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/arduino-esp32/releases/download/1.0.5-rc1/esp32-s2-1.0.5-rc1.zip
                               toolchain-xtensa32 @ https://github.com/Jason2866/platform-espressif32/releases/download/8.4.0/xtensa-esp32-elf-gcc8_4_0-esp-2020r3-linux-amd64.tar.gz
                               platformio/tool-mklittlefs @ ~1.203.200522