diff --git a/platformio.ini b/platformio.ini
index 67564236..b6835fab 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -13,6 +13,10 @@
 [platformio]
 extra_configs =
     user_setups/lcd_config.ini
+    ; --  Base configurations per platform
+    user_setups/esp32/_esp32.ini
+    user_setups/esp32s2/_esp32s2.ini
+    user_setups/es98266/_esp8266.ini
     ; --  Put active [env] files in this dir to be included in the build menu
     user_setups/active/*.ini
     ; --  Add customizations to this file only:
diff --git a/user_setups/esp32/_esp32.ini b/user_setups/esp32/_esp32.ini
index ce37f432..811b347c 100644
--- a/user_setups/esp32/_esp32.ini
+++ b/user_setups/esp32/_esp32.ini
@@ -1,16 +1,5 @@
 ; -- Platform specific build flags
 [esp32]
-framework = arduino
-platform = espressif32@^3.3.2
-
-board_build.filesystem = littlefs
-board_build.embed_files =
-    data/edit.htm.gz
-    data/style.css.gz
-
-; ----- crash reporter
-monitor_filters = esp32_exception_decoder
-
 ; ----- debugger
 check_tool = cppcheck
 check_flags = --enable=all
@@ -90,23 +79,62 @@ hspi =
     -D TFT_SCLK=14
 
 
-; -- The ESP32 has 3 available flash sizes:
+; -- The Arduino ESP32 v1.0.6 with 3 available flash sizes:
+[arduino_esp32_v1]
+framework = arduino
+platform = espressif32@^3.3.2
+board_build.embed_files =
+    data/edit.htm.gz
+    data/style.css.gz
+board_build.filesystem = littlefs
+; ----- crash reporter
+monitor_filters = esp32_exception_decoder
+
 [esp32_4mb]
-extends = esp32
+extends = exp32, arduino_esp32_v1
 board_upload.flash_size=4MB
 board_upload.maximum_size = 4194304
 board_build.partitions = user_setups/esp32/partitions_4MB.csv
 
-
 [esp32_8mb]
-extends = esp32
+extends = exp32, arduino_esp32_v1
 board_upload.flash_size=8MB
 board_upload.maximum_size = 8388608
 board_build.partitions = user_setups/esp32/partitions_8MB.csv
 
-
 [esp32_16mb]
-extends = esp32
+extends = exp32, arduino_esp32_v1
 board_upload.flash_size = 16MB
 board_upload.maximum_size = 16777216
-board_build.partitions = user_setups/esp32/partitions_16MB.csv
\ No newline at end of file
+board_build.partitions = user_setups/esp32/partitions_16MB.csv
+
+
+; -- The Arduino ESP32 v2.0.1 with 3 available flash sizes:
+[arduino_esp32_v2]
+platform  = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
+platform_packages =
+   framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.0
+board_build.embed_files =
+    data/edit.htm.gz
+    data/style.css.gz
+board_build.filesystem = littlefs
+; ----- crash reporter
+monitor_filters = esp32_exception_decoder
+
+[esp32_4mb_v2]
+extends = exp32, arduino_esp32_v2
+board_upload.flash_size=4MB
+board_upload.maximum_size = 4194304
+board_build.partitions = user_setups/esp32/partitions_4MB.csv
+
+[esp32_8mb_v2]
+extends = exp32, arduino_esp32_v2
+board_upload.flash_size=8MB
+board_upload.maximum_size = 8388608
+board_build.partitions = user_setups/esp32/partitions_8MB.csv
+
+[esp32_16mb_v2]
+extends = exp32, arduino_esp32_v2
+board_upload.flash_size = 16MB
+board_upload.maximum_size = 16777216
+board_build.partitions = user_setups/esp32/partitions_16MB.csv
diff --git a/user_setups/esp32s2/_esp32s2.ini b/user_setups/esp32s2/_esp32s2.ini
index 609c32dd..29010390 100644
--- a/user_setups/esp32s2/_esp32s2.ini
+++ b/user_setups/esp32s2/_esp32s2.ini
@@ -5,7 +5,7 @@ framework = arduino
 
 platform  = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
 platform_packages =
-   framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.0
+   framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.1
 
 board_build.mcu = esp32s2
 board_build.f_cpu = 240000000L