diff --git a/.gitignore b/.gitignore
index 2dbf50516..1dd51a787 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,14 +19,10 @@ data
 unpacked_fs
 tasmota/user_config_override.h
 build
-build_output
+build_output/*
 firmware.map
 firmware.asm
 tasmota/tasmota.ino.cpp
-tasmota*.bin
-tasmota*.bin.gz
-tasmota*.map
-tasmota*.map.gz
 platformio_override.ini
 platformio_tasmota_cenv.ini
 
diff --git a/boards/esp32_4M_2APP.json b/boards/esp32_4M_2APP.json
new file mode 100644
index 000000000..e9dc5635c
--- /dev/null
+++ b/boards/esp32_4M_2APP.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_app2880k_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": {
+      "arduino": {
+        "flash_extra_images": [
+          [
+            "0x2E0000",
+            "tasmota32-minicustom.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/esp32_partition_app2880k_spiffs320k.csv b/esp32_partition_app2880k_spiffs320k.csv
new file mode 100644
index 000000000..511ce01a1
--- /dev/null
+++ b/esp32_partition_app2880k_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, 0x2D0000,
+factory,  app,  factory, 0x2E0000,0xD0000,
+spiffs,   data, spiffs,  0x3B0000,0x50000,
diff --git a/safemode.bin/tasmota32-minicustom.bin b/safemode.bin/tasmota32-minicustom.bin
new file mode 100644
index 000000000..e614201ff
Binary files /dev/null and b/safemode.bin/tasmota32-minicustom.bin differ