diff --git a/boards/esp32-cam.json b/boards/esp32-cam.json
index 4691051e4..30fb7d3c4 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_app1856k_spiffs320k.csv"
+    "partitions": "esp32_partition_app2880k_spiffs320k.csv"
   },
   "connectivity": [
     "wifi",
@@ -25,8 +25,16 @@
     "arduino",
     "espidf"
   ],
-  "name": "AI Thinker ESP32-CAM, 4M Flash 4MB PSRAM, Tasmota 1856k Code/OTA, 320k FS",
+  "name": "AI Thinker ESP32-CAM, 4M Flash 4MB PSRAM, 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,
diff --git a/boards/esp32_4M.json b/boards/esp32_4M.json
index ee7effe39..a998cdc7f 100644
--- a/boards/esp32_4M.json
+++ b/boards/esp32_4M.json
@@ -1,38 +1,46 @@
 {
-  "build": {
-    "arduino":{
-      "ldscript": "esp32_out.ld"
+    "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_app2880k_spiffs320k.csv"
     },
-    "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_spiffs320k.csv"
-  },
-  "connectivity": [
-    "wifi",
-    "bluetooth",
-    "ethernet",
-    "can"
-  ],
-  "debug": {
-    "openocd_target": "esp32.cfg"
-  },
-  "frameworks": [
-    "arduino",
-    "espidf"
-  ],
-  "name": "Espressif Generic ESP32 4M Flash, Tasmota 1856k Code/OTA, 320k FS",
-  "upload": {
-    "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"
-}
+    "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_4M_2APP.json b/boards/esp32_4M_2APP.json
deleted file mode 100644
index a998cdc7f..000000000
--- a/boards/esp32_4M_2APP.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "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_app2880k_spiffs320k.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_solo1_4M.json b/boards/esp32_solo1_4M.json
index e5b86ade8..ec6532969 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_app1856k_spiffs320k.csv"
+    "partitions": "esp32_partition_app2880k_spiffs320k.csv"
   },
   "connectivity": [
     "wifi",
@@ -25,8 +25,16 @@
     "arduino",
     "espidf"
   ],
-  "name": "Espressif Generic ESP32 4M Flash, Tasmota 1856k Code/OTA, 320k FS",
+  "name": "Espressif Generic ESP32 4M Flash, Tasmota 2880k Code/OTA, 320k FS",
   "upload": {
+    "arduino": {
+      "flash_extra_images": [
+        [
+          "0x10000",
+          "variants/tasmota/tasmota32solo1-safemode.bin"
+        ]
+      ]
+    },
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
diff --git a/boards/esp32c3.json b/boards/esp32c3.json
index 8e1dae3d5..0de9a401c 100644
--- a/boards/esp32c3.json
+++ b/boards/esp32c3.json
@@ -1,35 +1,43 @@
 {
-  "build": {
-    "arduino":{
-      "ldscript": "esp32c3_out.ld"
+    "build": {
+      "arduino":{
+        "ldscript": "esp32c3_out.ld"
+      },
+      "core": "esp32",
+      "extra_flags": "-DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32C3",
+      "f_cpu": "160000000L",
+      "f_flash": "80000000L",
+      "flash_mode": "dout",
+      "mcu": "esp32c3",
+      "variant": "esp32c3",
+      "partitions": "esp32_partition_app2880k_spiffs320k.csv"
     },
-    "core": "esp32",
-    "extra_flags": "-DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32C3",
-    "f_cpu": "160000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "dout",
-    "mcu": "esp32c3",
-    "variant": "esp32c3",
-    "partitions": "esp32_partition_app1856k_spiffs320k.csv"
-  },
-  "connectivity": [
-    "wifi"
-  ],
-  "debug": {
-    "openocd_target": "esp32c3.cfg"
-  },
-  "frameworks": [
-    "arduino",
-    "espidf"
-  ],
-  "name": "Espressif Generic ESP32-C3 4M Flash, Tasmota 1856k Code/OTA, 320k FS",
-  "upload": {
-    "flash_size": "4MB",
-    "maximum_ram_size": 327680,
-    "maximum_size": 4194304,
-    "require_upload_port": true,
-    "speed": 460800
-  },
-  "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32c3/hw-reference/esp32c3/user-guide-devkitm-1.html",
-  "vendor": "Espressif"
-}
+    "connectivity": [
+      "wifi"
+    ],
+    "debug": {
+      "openocd_target": "esp32c3.cfg"
+    },
+    "frameworks": [
+      "arduino",
+      "espidf"
+    ],
+    "name": "Espressif Generic ESP32-C3 4M Flash, Tasmota 2880k Code/OTA, 320k FS",
+    "upload": {
+      "arduino": {
+        "flash_extra_images": [
+          [
+            "0x10000",
+            "variants/tasmota/tasmota32c3-safemode.bin"
+          ]
+        ]
+      },
+      "flash_size": "4MB",
+      "maximum_ram_size": 327680,
+      "maximum_size": 4194304,
+      "require_upload_port": true,
+      "speed": 460800
+    },
+    "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32c3/hw-reference/esp32c3/user-guide-devkitm-1.html",
+    "vendor": "Espressif"
+  }
diff --git a/boards/esp32c3_2APP.json b/boards/esp32c3_2APP.json
deleted file mode 100644
index 1d21ff1df..000000000
--- a/boards/esp32c3_2APP.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "build": {
-      "arduino":{
-        "ldscript": "esp32c3_out.ld"
-      },
-      "core": "esp32",
-      "extra_flags": "-DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32C3",
-      "f_cpu": "160000000L",
-      "f_flash": "80000000L",
-      "flash_mode": "dout",
-      "mcu": "esp32c3",
-      "variant": "esp32c3",
-      "partitions": "esp32_partition_app2880k_spiffs320k.csv"
-    },
-    "connectivity": [
-      "wifi"
-    ],
-    "debug": {
-      "openocd_target": "esp32c3.cfg"
-    },
-    "frameworks": [
-      "arduino",
-      "espidf"
-    ],
-    "name": "Espressif Generic ESP32-C3 4M Flash, Tasmota 2880k Code/OTA, 320k FS",
-    "upload": {
-        "arduino": {
-            "flash_extra_images": [
-              [
-                "0x10000",
-                "variants/tasmota/tasmota32c3-safemode.bin"
-              ]
-            ]
-          },
-      "flash_size": "4MB",
-      "maximum_ram_size": 327680,
-      "maximum_size": 4194304,
-      "require_upload_port": true,
-      "speed": 460800
-    },
-    "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32c3/hw-reference/esp32c3/user-guide-devkitm-1.html",
-    "vendor": "Espressif"
-  }
diff --git a/boards/esp32s2.json b/boards/esp32s2.json
index 07c043b2f..d2ce7a5db 100644
--- a/boards/esp32s2.json
+++ b/boards/esp32s2.json
@@ -10,7 +10,7 @@
     "flash_mode": "dout",
     "mcu": "esp32s2",
     "variant": "esp32s2",
-    "partitions": "esp32_partition_app1856k_spiffs320k.csv"
+    "partitions": "esp32_partition_app2880k_spiffs320k.csv"
   },
   "connectivity": [
     "wifi"
@@ -22,8 +22,16 @@
     "espidf",
     "arduino"
   ],
-  "name": "Espressif Generic ESP32-S2 4M Flash, Tasmota 1856k Code/OTA, 320k FS",
+  "name": "Espressif Generic ESP32-S2 4M Flash, Tasmota 2880k Code/OTA, 320k FS",
   "upload": {
+    "arduino": {
+      "flash_extra_images": [
+        [
+          "0x10000",
+          "variants/tasmota/tasmota32s2-safemode.bin"
+        ]
+      ]
+    },
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
diff --git a/boards/esp32s2_2APP.json b/boards/esp32s2_2APP.json
deleted file mode 100644
index 0227a4a11..000000000
--- a/boards/esp32s2_2APP.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "build": {
-    "arduino":{
-      "ldscript": "esp32s2_out.ld"
-    },
-    "core": "esp32",
-    "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=0 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DESP32_4M -DESP32S2",
-    "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "dout",
-    "mcu": "esp32s2",
-    "variant": "esp32s2",
-    "partitions": "esp32_partition_app2880k_spiffs320k.csv"
-  },
-  "connectivity": [
-    "wifi"
-  ],
-  "debug": {
-    "openocd_target": "esp32s2.cfg"
-  },
-  "frameworks": [
-    "espidf",
-    "arduino"
-  ],
-  "name": "Espressif Generic ESP32-S2 4M Flash, Tasmota 2880k Code/OTA, 320k FS",
-  "upload": {
-  "arduino": {
-      "flash_extra_images": [
-        [
-          "0x10000",
-          "variants/tasmota/tasmota32s2-safemode.bin"
-        ]
-      ]
-    },
-    "flash_size": "4MB",
-    "maximum_ram_size": 327680,
-    "maximum_size": 4194304,
-    "require_upload_port": true,
-    "speed": 460800
-  },
-  "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/hw-reference/esp32s2/user-guide-saola-1-v1.2.html",
-  "vendor": "Espressif"
-}
diff --git a/boards/esp32s3.json b/boards/esp32s3.json
index 78f03cced..312b7cb7d 100644
--- a/boards/esp32s3.json
+++ b/boards/esp32s3.json
@@ -11,7 +11,7 @@
     "flash_mode": "dio",
     "mcu": "esp32s3",
     "variant": "esp32s3",
-    "partitions": "esp32_partition_app1856k_spiffs320k.csv"
+    "partitions": "esp32_partition_app2880k_spiffs320k.csv"
   },
   "connectivity": [
     "wifi",
@@ -25,8 +25,16 @@
     "espidf",
     "arduino"
   ],
-  "name": "Espressif Generic ESP32-S3 4M Flash, Tasmota 1856k Code/OTA, 320k FS",
+  "name": "Espressif Generic ESP32-S3 4M Flash, Tasmota 2880k Code/OTA, 320k FS",
   "upload": {
+    "arduino": {
+      "flash_extra_images": [
+        [
+          "0x10000",
+          "variants/tasmota/tasmota32s3-safemode.bin"
+        ]
+      ]
+    },
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
diff --git a/boards/esp32s3_2APP.json b/boards/esp32s3_2APP.json
deleted file mode 100644
index 1a37483e4..000000000
--- a/boards/esp32s3_2APP.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "build": {
-    "arduino":{
-      "ldscript": "esp32s3_out.ld",
-      "memory_type": "qspi_qspi"
-    },
-    "core": "esp32",
-    "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=0 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DESP32_4M -DESP32S3",
-    "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "dio",
-    "mcu": "esp32s3",
-    "variant": "esp32s3",
-    "partitions": "esp32_partition_app2880k_spiffs320k.csv"
-  },
-  "connectivity": [
-    "wifi",
-    "bluetooth",
-    "ethernet"
-  ],
-  "debug": {
-    "openocd_target": "esp32s3.cfg"
-  },
-  "frameworks": [
-    "espidf",
-    "arduino"
-  ],
-  "name": "Espressif Generic ESP32-S3 4M Flash, Tasmota 2880k Code/OTA, 320k FS",
-  "upload": {
-  "arduino": {
-      "flash_extra_images": [
-        [
-          "0x10000",
-          "variants/tasmota/tasmota32s3-safemode.bin"
-        ]
-      ]
-    },
-    "flash_size": "4MB",
-    "maximum_ram_size": 327680,
-    "maximum_size": 4194304,
-    "require_upload_port": true,
-    "speed": 460800
-  },
-  "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/",
-  "vendor": "Espressif"
-}