diff --git a/boards.txt b/boards.txt
index 2afe45f50a6..88d5eacfffc 100644
--- a/boards.txt
+++ b/boards.txt
@@ -940,6 +940,9 @@ esp32s3.menu.PartitionScheme.app5M_fat24M_32MB.upload.maximum_size=4718592
 esp32s3.menu.PartitionScheme.app5M_little24M_32MB=32M Flash (4.8MB APP/22MB LittleFS)
 esp32s3.menu.PartitionScheme.app5M_little24M_32MB.build.partitions=large_littlefs_32MB
 esp32s3.menu.PartitionScheme.app5M_little24M_32MB.upload.maximum_size=4718592
+esp32s3.menu.PartitionScheme.app13M_data7M_32MB=32M Flash (13MB APP/6.75MB SPIFFS)
+esp32s3.menu.PartitionScheme.app13M_data7M_32MB.build.partitions=default_32MB
+esp32s3.menu.PartitionScheme.app13M_data7M_32MB.upload.maximum_size=13107200
 esp32s3.menu.PartitionScheme.esp_sr_16=ESP SR 16M (3MB APP/7MB SPIFFS/2.9MB MODEL)
 esp32s3.menu.PartitionScheme.esp_sr_16.upload.maximum_size=3145728
 esp32s3.menu.PartitionScheme.esp_sr_16.upload.extra_flags=0xD10000 {build.path}/srmodels.bin
@@ -2148,6 +2151,9 @@ esp32s3-octal.menu.PartitionScheme.app5M_fat24M_32MB.upload.maximum_size=4718592
 esp32s3-octal.menu.PartitionScheme.app5M_little24M_32MB=32M Flash (4.8MB APP/22MB LittleFS)
 esp32s3-octal.menu.PartitionScheme.app5M_little24M_32MB.build.partitions=large_littlefs_32MB
 esp32s3-octal.menu.PartitionScheme.app5M_little24M_32MB.upload.maximum_size=4718592
+esp32s3-octal.menu.PartitionScheme.app13M_data7M_32MB=32M Flash (13MB APP/6.75MB SPIFFS)
+esp32s3-octal.menu.PartitionScheme.app13M_data7M_32MB.build.partitions=default_32MB
+esp32s3-octal.menu.PartitionScheme.app13M_data7M_32MB.upload.maximum_size=13107200
 
 esp32s3-octal.menu.CPUFreq.240=240MHz (WiFi)
 esp32s3-octal.menu.CPUFreq.240.build.f_cpu=240000000L
diff --git a/tools/partitions/default_32MB.csv b/tools/partitions/default_32MB.csv
new file mode 100644
index 00000000000..dd07ac32185
--- /dev/null
+++ b/tools/partitions/default_32MB.csv
@@ -0,0 +1,7 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0xC80000,
+app1,     app,  ota_1,   0xC90000,0xC80000,
+spiffs,   data, spiffs,  0x1910000,0x6C0000,
+coredump, data, coredump,0x1FF0000,0x10000,