diff --git a/boards/esp32-cam.json b/boards/esp32-cam.json
index 30fb7d3c4..b034f6b77 100644
--- a/boards/esp32-cam.json
+++ b/boards/esp32-cam.json
@@ -10,7 +10,7 @@
     "flash_mode": "dout",
     "mcu": "esp32",
     "variant": "esp32",
-    "partitions": "esp32_partition_app2880k_spiffs320k.csv"
+    "partitions": "esp32_partition_app2880k_fs320k.csv"
   },
   "connectivity": [
     "wifi",
diff --git a/boards/esp32-m5core2.json b/boards/esp32-m5core2.json
index 137f023a9..8567085ea 100644
--- a/boards/esp32-m5core2.json
+++ b/boards/esp32-m5core2.json
@@ -10,7 +10,7 @@
     "flash_mode": "dout",
     "mcu": "esp32",
     "variant": "m5stack_core2",
-    "partitions": "esp32_partition_app2944k_spiffs10M.csv"
+    "partitions": "esp32_partition_app2944k_fs10M.csv"
   },
   "connectivity": [
     "wifi",
diff --git a/boards/esp32-odroid.json b/boards/esp32-odroid.json
index 119af3d9e..a21cedaa9 100644
--- a/boards/esp32-odroid.json
+++ b/boards/esp32-odroid.json
@@ -10,7 +10,7 @@
     "flash_mode": "dout",
     "mcu": "esp32",
     "variant": "odroid_esp32",
-    "partitions": "esp32_partition_app2944k_spiffs10M.csv"
+    "partitions": "esp32_partition_app2944k_fs10M.csv"
   },
   "connectivity": [
     "wifi",
diff --git a/boards/esp32_16M.json b/boards/esp32_16M.json
index 9667b46ff..8314fa5b7 100644
--- a/boards/esp32_16M.json
+++ b/boards/esp32_16M.json
@@ -10,7 +10,7 @@
     "flash_mode": "dout",
     "mcu": "esp32",
     "variant": "esp32",
-    "partitions": "esp32_partition_app2944k_spiffs10M.csv"
+    "partitions": "esp32_partition_app2944k_fs10M.csv"
   },
   "connectivity": [
     "wifi",
diff --git a/boards/esp32_4M.json b/boards/esp32_4M.json
index a998cdc7f..e872ec7af 100644
--- a/boards/esp32_4M.json
+++ b/boards/esp32_4M.json
@@ -10,7 +10,7 @@
       "flash_mode": "dout",
       "mcu": "esp32",
       "variant": "esp32",
-      "partitions": "esp32_partition_app2880k_spiffs320k.csv"
+      "partitions": "esp32_partition_app2880k_fs320k.csv"
     },
     "connectivity": [
       "wifi",
diff --git a/boards/esp32_4M_FS.json b/boards/esp32_4M_FS.json
new file mode 100644
index 000000000..6178700f9
--- /dev/null
+++ b/boards/esp32_4M_FS.json
@@ -0,0 +1,46 @@
+{
+    "build": {
+      "arduino":{
+        "ldscript": "esp32_out.ld"
+      },
+      "core": "esp32",
+      "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M",
+      "f_cpu": "80000000L",
+      "f_flash": "40000000L",
+      "flash_mode": "dout",
+      "mcu": "esp32",
+      "variant": "esp32",
+      "partitions": "esp32_partition_app1856k_fs1344k.csv"
+    },
+    "connectivity": [
+      "wifi",
+      "bluetooth",
+      "ethernet",
+      "can"
+    ],
+    "debug": {
+      "openocd_target": "esp32.cfg"
+    },
+    "frameworks": [
+      "arduino",
+      "espidf"
+    ],
+    "name": "Espressif Generic ESP32 4M Flash, Tasmota 2880k Code/OTA, 320k FS",
+    "upload": {
+      "arduino": {
+        "flash_extra_images": [
+          [
+            "0x10000",
+            "variants/tasmota/tasmota32-safemode.bin"
+          ]
+        ]
+      },
+      "flash_size": "4MB",
+      "maximum_ram_size": 327680,
+      "maximum_size": 4194304,
+      "require_upload_port": true,
+      "speed": 460800
+    },
+    "url": "https://en.wikipedia.org/wiki/ESP32",
+    "vendor": "Espressif"
+  }
diff --git a/boards/esp32_8M.json b/boards/esp32_8M.json
index b5dcfd676..cca93e38d 100644
--- a/boards/esp32_8M.json
+++ b/boards/esp32_8M.json
@@ -10,7 +10,7 @@
     "flash_mode": "dout",
     "mcu": "esp32",
     "variant": "esp32",
-    "partitions": "esp32_partition_app2944k_spiffs2M.csv"
+    "partitions": "esp32_partition_app2944k_fs2M.csv"
   },
   "connectivity": [
     "wifi",
diff --git a/boards/esp32_solo1_4M.json b/boards/esp32_solo1_4M.json
index ec6532969..cbd2ac2fd 100644
--- a/boards/esp32_solo1_4M.json
+++ b/boards/esp32_solo1_4M.json
@@ -10,7 +10,7 @@
     "flash_mode": "dout",
     "mcu": "esp32",
     "variant": "esp32",
-    "partitions": "esp32_partition_app2880k_spiffs320k.csv"
+    "partitions": "esp32_partition_app2880k_fs320k.csv"
   },
   "connectivity": [
     "wifi",
diff --git a/boards/esp32c3.json b/boards/esp32c3.json
index 0de9a401c..cfbb41aec 100644
--- a/boards/esp32c3.json
+++ b/boards/esp32c3.json
@@ -10,7 +10,7 @@
       "flash_mode": "dout",
       "mcu": "esp32c3",
       "variant": "esp32c3",
-      "partitions": "esp32_partition_app2880k_spiffs320k.csv"
+      "partitions": "esp32_partition_app2880k_fs320k.csv"
     },
     "connectivity": [
       "wifi"
diff --git a/boards/esp32s2.json b/boards/esp32s2.json
index d2ce7a5db..b6dc307ca 100644
--- a/boards/esp32s2.json
+++ b/boards/esp32s2.json
@@ -10,7 +10,7 @@
     "flash_mode": "dout",
     "mcu": "esp32s2",
     "variant": "esp32s2",
-    "partitions": "esp32_partition_app2880k_spiffs320k.csv"
+    "partitions": "esp32_partition_app2880k_fs320k.csv"
   },
   "connectivity": [
     "wifi"
diff --git a/boards/esp32s3.json b/boards/esp32s3.json
index 312b7cb7d..6299a5317 100644
--- a/boards/esp32s3.json
+++ b/boards/esp32s3.json
@@ -11,7 +11,7 @@
     "flash_mode": "dio",
     "mcu": "esp32s3",
     "variant": "esp32s3",
-    "partitions": "esp32_partition_app2880k_spiffs320k.csv"
+    "partitions": "esp32_partition_app2880k_fs320k.csv"
   },
   "connectivity": [
     "wifi",
diff --git a/boards/esp32s3_8M.json b/boards/esp32s3_8M.json
index 1996236c7..affbb0479 100644
--- a/boards/esp32s3_8M.json
+++ b/boards/esp32s3_8M.json
@@ -11,7 +11,7 @@
     "flash_mode": "dio",
     "mcu": "esp32s3",
     "variant": "esp32s3",
-    "partitions": "esp32_partition_app2944k_spiffs2M.csv"
+    "partitions": "esp32_partition_app2944k_fs2M.csv"
   },
   "connectivity": [
     "wifi",
diff --git a/esp32_partition_app1572k_spiffs983k.csv b/esp32_partition_app1572k_fs983k.csv
similarity index 100%
rename from esp32_partition_app1572k_spiffs983k.csv
rename to esp32_partition_app1572k_fs983k.csv
diff --git a/esp32_partition_app1856k_fs1344k.csv b/esp32_partition_app1856k_fs1344k.csv
new file mode 100644
index 000000000..6a75c7547
--- /dev/null
+++ b/esp32_partition_app1856k_fs1344k.csv
@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+safeboot, app,  factory, 0x10000, 0xD0000,
+app0,     app,  ota_0,   0xE0000, 0x1D0000,
+spiffs,   data, spiffs,  0x2B0000,0x150000,
diff --git a/esp32_partition_app1856k_spiffs320k.csv b/esp32_partition_app1856k_fs320k.csv
similarity index 100%
rename from esp32_partition_app1856k_spiffs320k.csv
rename to esp32_partition_app1856k_fs320k.csv
diff --git a/esp32_partition_app2880k_spiffs320k.csv b/esp32_partition_app2880k_fs320k.csv
similarity index 83%
rename from esp32_partition_app2880k_spiffs320k.csv
rename to esp32_partition_app2880k_fs320k.csv
index ee2ce899c..849fcce41 100644
--- a/esp32_partition_app2880k_spiffs320k.csv
+++ b/esp32_partition_app2880k_fs320k.csv
@@ -1,6 +1,6 @@
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     0x9000,  0x5000,
 otadata,  data, ota,     0xe000,  0x2000,
-factory,  app,  factory, 0x10000, 0xD0000,
+safeboot, app,  factory, 0x10000, 0xD0000,
 app0,     app,  ota_0,   0xE0000, 0x2D0000,
 spiffs,   data, spiffs,  0x3B0000,0x50000,
diff --git a/esp32_partition_app2944k_spiffs10M.csv b/esp32_partition_app2944k_fs10M.csv
similarity index 100%
rename from esp32_partition_app2944k_spiffs10M.csv
rename to esp32_partition_app2944k_fs10M.csv
diff --git a/esp32_partition_app2944k_spiffs2M.csv b/esp32_partition_app2944k_fs2M.csv
similarity index 100%
rename from esp32_partition_app2944k_spiffs2M.csv
rename to esp32_partition_app2944k_fs2M.csv