diff --git a/boards.txt b/boards.txt
index 8b13bc511..fe5a7c33d 100644
--- a/boards.txt
+++ b/boards.txt
@@ -9831,7 +9831,7 @@ adafruit_metro_esp32s2.menu.PSRAM.disabled.build.defines=
 
 adafruit_metro_esp32s2.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
 adafruit_metro_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_metro_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_metro_esp32s2.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
 adafruit_metro_esp32s2.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
 adafruit_metro_esp32s2.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
 adafruit_metro_esp32s2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
@@ -10026,7 +10026,7 @@ adafruit_metro_esp32s3.menu.PSRAM.disabled.build.psram_type=opi
 
 adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2=TinyUF2 16MB (2MB APP/11.6MB FATFS)
 adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-16MB-tinyuf2
+adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-16MB
 adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2.upload.maximum_size=2097152
 adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
 adafruit_metro_esp32s3.menu.PartitionScheme.default_16MB=Default (6.25MB APP/3.43MB SPIFFS)
@@ -10195,7 +10195,7 @@ adafruit_magtag29_esp32s2.menu.PSRAM.disabled.build.defines=
 
 adafruit_magtag29_esp32s2.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
 adafruit_magtag29_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_magtag29_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_magtag29_esp32s2.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
 adafruit_magtag29_esp32s2.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
 adafruit_magtag29_esp32s2.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
 adafruit_magtag29_esp32s2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
@@ -10367,7 +10367,7 @@ adafruit_funhouse_esp32s2.menu.PSRAM.disabled.build.defines=
 
 adafruit_funhouse_esp32s2.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
 adafruit_funhouse_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_funhouse_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_funhouse_esp32s2.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
 adafruit_funhouse_esp32s2.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
 adafruit_funhouse_esp32s2.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
 adafruit_funhouse_esp32s2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
@@ -10791,7 +10791,7 @@ adafruit_feather_esp32s2.menu.PSRAM.disabled.build.defines=
 
 adafruit_feather_esp32s2.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
 adafruit_feather_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_feather_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_feather_esp32s2.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
 adafruit_feather_esp32s2.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
 adafruit_feather_esp32s2.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
 adafruit_feather_esp32s2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
@@ -10963,7 +10963,7 @@ adafruit_feather_esp32s2_tft.menu.PSRAM.disabled.build.defines=
 
 adafruit_feather_esp32s2_tft.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
 adafruit_feather_esp32s2_tft.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_feather_esp32s2_tft.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_feather_esp32s2_tft.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
 adafruit_feather_esp32s2_tft.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
 adafruit_feather_esp32s2_tft.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
 adafruit_feather_esp32s2_tft.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
@@ -11135,7 +11135,7 @@ adafruit_feather_esp32s2_reversetft.menu.PSRAM.disabled.build.defines=
 
 adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
 adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
 adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
 adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
 adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
@@ -11333,7 +11333,7 @@ adafruit_feather_esp32s3.menu.PSRAM.opi.build.psram_type=opi
 
 adafruit_feather_esp32s3.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
 adafruit_feather_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_feather_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_feather_esp32s3.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
 adafruit_feather_esp32s3.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
 adafruit_feather_esp32s3.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
 adafruit_feather_esp32s3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
@@ -11530,7 +11530,7 @@ adafruit_feather_esp32s3_nopsram.menu.UploadMode.default.upload.wait_for_upload_
 
 adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.tinyuf2=TinyUF2 8MB (2MB APP/3.7MB FATFS)
 adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-8MB-tinyuf2
+adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-8MB
 adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.upload.maximum_size=2097152
 adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
 adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)
@@ -11716,7 +11716,7 @@ adafruit_feather_esp32s3_tft.menu.PSRAM.opi.build.psram_type=opi
 
 adafruit_feather_esp32s3_tft.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
 adafruit_feather_esp32s3_tft.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_feather_esp32s3_tft.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_feather_esp32s3_tft.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
 adafruit_feather_esp32s3_tft.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
 adafruit_feather_esp32s3_tft.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
 adafruit_feather_esp32s3_tft.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
@@ -11923,7 +11923,7 @@ adafruit_feather_esp32s3_reversetft.menu.PSRAM.opi.build.psram_type=opi
 
 adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
 adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
 adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
 adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
 adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
@@ -12359,7 +12359,7 @@ adafruit_qtpy_esp32s2.menu.PSRAM.disabled.build.defines=
 
 adafruit_qtpy_esp32s2.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
 adafruit_qtpy_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_qtpy_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_qtpy_esp32s2.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
 adafruit_qtpy_esp32s2.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
 adafruit_qtpy_esp32s2.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
 adafruit_qtpy_esp32s2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
@@ -12547,7 +12547,7 @@ adafruit_qtpy_esp32s3_nopsram.menu.UploadMode.default.upload.wait_for_upload_por
 
 adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.tinyuf2=TinyUF2 8MB (2MB APP/3.7MB FATFS)
 adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-8MB-tinyuf2
+adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-8MB
 adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.upload.maximum_size=2097152
 adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
 adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)
@@ -12733,7 +12733,7 @@ adafruit_qtpy_esp32s3_n4r2.menu.PSRAM.opi.build.psram_type=opi
 
 adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
 adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
 adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
 adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
 adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
@@ -13058,7 +13058,7 @@ adafruit_matrixportal_esp32s3.menu.PSRAM.opi.build.psram_type=opi
 
 adafruit_matrixportal_esp32s3.menu.PartitionScheme.tinyuf2=TinyUF2 8MB (2MB APP/3.7MB FATFS)
 adafruit_matrixportal_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_matrixportal_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-8MB-tinyuf2
+adafruit_matrixportal_esp32s3.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-8MB
 adafruit_matrixportal_esp32s3.menu.PartitionScheme.tinyuf2.upload.maximum_size=2097152
 adafruit_matrixportal_esp32s3.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
 adafruit_matrixportal_esp32s3.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)
@@ -13448,7 +13448,7 @@ adafruit_qualia_s3_rgb666.menu.PSRAM.disabled.build.psram_type=opi
 
 adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2=TinyUF2 16MB (2MB APP/11.6MB FATFS)
 adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-16MB-tinyuf2
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-16MB
 adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2.upload.maximum_size=2097152
 adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
 adafruit_qualia_s3_rgb666.menu.PartitionScheme.default_16MB=Default (6.25MB APP/3.43MB SPIFFS)
diff --git a/variants/adafruit_feather_esp32s2/partitions-4MB-tinyuf2.csv b/variants/adafruit_feather_esp32s2/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d59..000000000
--- a/variants/adafruit_feather_esp32s2/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,          0x8000, 4K
-
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  1408K,
-ota_1,    0,    ota_1,  0x170000,  1408K,
-uf2,      app,  factory,0x2d0000,  256K,
-ffat,     data, fat,    0x310000,  960K,
diff --git a/variants/adafruit_feather_esp32s2_reversetft/partitions-4MB-tinyuf2.csv b/variants/adafruit_feather_esp32s2_reversetft/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d59..000000000
--- a/variants/adafruit_feather_esp32s2_reversetft/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,          0x8000, 4K
-
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  1408K,
-ota_1,    0,    ota_1,  0x170000,  1408K,
-uf2,      app,  factory,0x2d0000,  256K,
-ffat,     data, fat,    0x310000,  960K,
diff --git a/variants/adafruit_feather_esp32s2_tft/partitions-4MB-tinyuf2.csv b/variants/adafruit_feather_esp32s2_tft/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d59..000000000
--- a/variants/adafruit_feather_esp32s2_tft/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,          0x8000, 4K
-
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  1408K,
-ota_1,    0,    ota_1,  0x170000,  1408K,
-uf2,      app,  factory,0x2d0000,  256K,
-ffat,     data, fat,    0x310000,  960K,
diff --git a/variants/adafruit_feather_esp32s3/partitions-4MB-tinyuf2.csv b/variants/adafruit_feather_esp32s3/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d59..000000000
--- a/variants/adafruit_feather_esp32s3/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,          0x8000, 4K
-
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  1408K,
-ota_1,    0,    ota_1,  0x170000,  1408K,
-uf2,      app,  factory,0x2d0000,  256K,
-ffat,     data, fat,    0x310000,  960K,
diff --git a/variants/adafruit_feather_esp32s3_nopsram/partitions-8MB-tinyuf2.csv b/variants/adafruit_feather_esp32s3_nopsram/partitions-8MB-tinyuf2.csv
deleted file mode 100644
index 4026378b6..000000000
--- a/variants/adafruit_feather_esp32s3_nopsram/partitions-8MB-tinyuf2.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,,         0x8000, 4K
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  2048K,
-ota_1,    0,    ota_1,  0x210000,  2048K,
-uf2,      app,  factory,0x410000,  256K,
-ffat,     data, fat,    0x450000,  3776K,
diff --git a/variants/adafruit_feather_esp32s3_reversetft/partitions-4MB-tinyuf2.csv b/variants/adafruit_feather_esp32s3_reversetft/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d59..000000000
--- a/variants/adafruit_feather_esp32s3_reversetft/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,          0x8000, 4K
-
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  1408K,
-ota_1,    0,    ota_1,  0x170000,  1408K,
-uf2,      app,  factory,0x2d0000,  256K,
-ffat,     data, fat,    0x310000,  960K,
diff --git a/variants/adafruit_feather_esp32s3_tft/partitions-4MB-tinyuf2.csv b/variants/adafruit_feather_esp32s3_tft/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d59..000000000
--- a/variants/adafruit_feather_esp32s3_tft/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,          0x8000, 4K
-
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  1408K,
-ota_1,    0,    ota_1,  0x170000,  1408K,
-uf2,      app,  factory,0x2d0000,  256K,
-ffat,     data, fat,    0x310000,  960K,
diff --git a/variants/adafruit_funhouse_esp32s2/partitions-4MB-tinyuf2.csv b/variants/adafruit_funhouse_esp32s2/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d59..000000000
--- a/variants/adafruit_funhouse_esp32s2/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,          0x8000, 4K
-
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  1408K,
-ota_1,    0,    ota_1,  0x170000,  1408K,
-uf2,      app,  factory,0x2d0000,  256K,
-ffat,     data, fat,    0x310000,  960K,
diff --git a/variants/adafruit_magtag29_esp32s2/partitions-4MB-tinyuf2.csv b/variants/adafruit_magtag29_esp32s2/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d59..000000000
--- a/variants/adafruit_magtag29_esp32s2/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,          0x8000, 4K
-
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  1408K,
-ota_1,    0,    ota_1,  0x170000,  1408K,
-uf2,      app,  factory,0x2d0000,  256K,
-ffat,     data, fat,    0x310000,  960K,
diff --git a/variants/adafruit_matrixportal_esp32s3/partitions-8MB-tinyuf2.csv b/variants/adafruit_matrixportal_esp32s3/partitions-8MB-tinyuf2.csv
deleted file mode 100644
index a68b39e9f..000000000
--- a/variants/adafruit_matrixportal_esp32s3/partitions-8MB-tinyuf2.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,,         0x8000, 4K
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    app,    ota_0,   0x10000,  2048K,
-ota_1,    app,    ota_1,  0x210000,  2048K,
-uf2,      app,  factory,0x410000,  256K,
-ffat,     data, fat,    0x450000,  3776K,
diff --git a/variants/adafruit_metro_esp32s2/partitions-4MB-tinyuf2.csv b/variants/adafruit_metro_esp32s2/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d59..000000000
--- a/variants/adafruit_metro_esp32s2/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,          0x8000, 4K
-
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  1408K,
-ota_1,    0,    ota_1,  0x170000,  1408K,
-uf2,      app,  factory,0x2d0000,  256K,
-ffat,     data, fat,    0x310000,  960K,
diff --git a/variants/adafruit_metro_esp32s3/partitions-16MB-tinyuf2.csv b/variants/adafruit_metro_esp32s3/partitions-16MB-tinyuf2.csv
deleted file mode 100644
index 55f6c2b8d..000000000
--- a/variants/adafruit_metro_esp32s3/partitions-16MB-tinyuf2.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,,         0x8000, 4K
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    app,  ota_0,   0x10000,  2048K,
-ota_1,    app,  ota_1,  0x210000,  2048K,
-uf2,      app,  factory,0x410000,  256K,
-ffat,     data, fat,    0x450000,  11968K,
diff --git a/variants/adafruit_qtpy_esp32s2/partitions-4MB-tinyuf2.csv b/variants/adafruit_qtpy_esp32s2/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d59..000000000
--- a/variants/adafruit_qtpy_esp32s2/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,          0x8000, 4K
-
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  1408K,
-ota_1,    0,    ota_1,  0x170000,  1408K,
-uf2,      app,  factory,0x2d0000,  256K,
-ffat,     data, fat,    0x310000,  960K,
diff --git a/variants/adafruit_qtpy_esp32s3_n4r2/partitions-4MB-tinyuf2.csv b/variants/adafruit_qtpy_esp32s3_n4r2/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index f3112a23b..000000000
--- a/variants/adafruit_qtpy_esp32s3_n4r2/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,          0x8000, 4K
-
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    app,  ota_0,   0x10000,  1408K,
-ota_1,    app,  ota_1,  0x170000,  1408K,
-uf2,      app,  factory,0x2d0000,  256K,
-ffat,     data, fat,    0x310000,  960K,
diff --git a/variants/adafruit_qtpy_esp32s3_nopsram/partitions-8MB-tinyuf2.csv b/variants/adafruit_qtpy_esp32s3_nopsram/partitions-8MB-tinyuf2.csv
deleted file mode 100644
index 4026378b6..000000000
--- a/variants/adafruit_qtpy_esp32s3_nopsram/partitions-8MB-tinyuf2.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,,         0x8000, 4K
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  2048K,
-ota_1,    0,    ota_1,  0x210000,  2048K,
-uf2,      app,  factory,0x410000,  256K,
-ffat,     data, fat,    0x450000,  3776K,
diff --git a/variants/adafruit_qualia_s3_rgb666/partitions-16MB-tinyuf2.csv b/variants/adafruit_qualia_s3_rgb666/partitions-16MB-tinyuf2.csv
deleted file mode 100644
index 55f6c2b8d..000000000
--- a/variants/adafruit_qualia_s3_rgb666/partitions-16MB-tinyuf2.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,,         0x8000, 4K
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    app,  ota_0,   0x10000,  2048K,
-ota_1,    app,  ota_1,  0x210000,  2048K,
-uf2,      app,  factory,0x410000,  256K,
-ffat,     data, fat,    0x450000,  11968K,