diff --git a/esp32_partition_app1810k_spiffs320k.csv b/esp32_partition_app1810k_spiffs320k.csv
new file mode 100644
index 000000000..49f6c1150
--- /dev/null
+++ b/esp32_partition_app1810k_spiffs320k.csv
@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x1D0000,
+app1,     app,  ota_1,   0x1E0000, 0x1D0000,
+spiffs,   data, spiffs,  0x3B0000,0x50000,
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index aa979497a..8a2ec07d6 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -230,6 +230,7 @@ platform                = espressif32@1.12.0
 platform_packages       =
 board                   = wemos_d1_mini32
 board_build.ldscript    = esp32_out.ld
+board_build.partitions  = esp32_partition_app1810k_spiffs320k.csv
 board_build.flash_mode  = ${common.board_build.flash_mode}
 board_build.f_cpu       = ${common.board_build.f_cpu}
 build_unflags           = ${common.build_unflags}
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index fb280f1bc..4f6661c17 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -4,6 +4,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -22,6 +23,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -40,6 +42,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -58,6 +61,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -76,6 +80,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -94,6 +99,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -112,6 +118,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -130,6 +137,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -148,6 +156,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -166,6 +175,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -184,6 +194,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -202,6 +213,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -220,6 +232,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -238,6 +251,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -256,6 +270,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -274,6 +289,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -292,6 +308,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -310,6 +327,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -328,6 +346,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -346,6 +365,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -364,6 +384,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -382,6 +403,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -400,6 +422,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -418,6 +441,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -436,6 +460,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -454,6 +479,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -472,6 +498,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -490,6 +517,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -508,6 +536,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}
@@ -526,6 +555,7 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.ldscript    = ${common32.board_build.ldscript}
+board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}