diff --git a/openevse_16mb.csv b/openevse_16mb.csv
new file mode 100644
index 00000000..67d77372
--- /dev/null
+++ b/openevse_16mb.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, 0x640000,
+app1,     app,  ota_1,   0x650000,0x640000,
+spiffs,   data, spiffs,  0xc90000,0x360000,
+coredump, data, coredump,0xFF0000,0x10000,
diff --git a/platformio.ini b/platformio.ini
index 7b8ab2d8..5e962118 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -99,8 +99,18 @@ build_flags =
   -D USE_ESP32
   -D USE_ESP32_FRAMEWORK_ARDUINO
   -D MG_MAX_HTTP_REQUEST_SIZE=8196
+build_flags_openevse_tft =
+  ${common.build_flags}
+  ${common.src_build_flags}
+  ${common.gfx_display_build_flags}
+  -D NEO_PIXEL_PIN=26
+  -D NEO_PIXEL_LENGTH=14
+  -D WIFI_PIXEL_NUMBER=1
+  -D WIFI_BUTTON=0
+  -D WIFI_BUTTON_PRESSED_STATE=LOW
 build_partitions = min_spiffs.csv
 build_partitions_debug = min_spiffs_debug.csv
+build_partitions_16mb = openevse_16mb.csv
 
 neopixel_lib = adafruit/Adafruit NeoPixel@1.11.0
 
@@ -424,32 +434,26 @@ upload_command = curl -F firmware=@$SOURCE http://$UPLOAD_PORT/update
 
 [env:openevse_wifi_tft_v1]
 board = denky32
-build_flags_openevse =
-  ${common.build_flags}
-  ${common.src_build_flags}
-  ${common.gfx_display_build_flags}
-  -D NEO_PIXEL_PIN=26
-  -D NEO_PIXEL_LENGTH=14
-  -D WIFI_PIXEL_NUMBER=1
-  -D WIFI_BUTTON=0
-  -D WIFI_BUTTON_PRESSED_STATE=LOW
 build_flags =
-  ${env:openevse_wifi_tft_v1.build_flags_openevse}
+  ${common.build_flags_openevse_tft}
   -D DEBUG_PORT=Serial2
   -D RAPI_PORT=Serial
 lib_deps =
   ${common.lib_deps}
   ${common.gfx_display_libs}
   ${common.neopixel_lib}
+board_build.partitions = ${common.build_partitions_16mb}
+board_upload.flash_size = 16MB
+board_build.flash_mode = qio
+board_build.f_flash = 80000000L
 
 [env:openevse_wifi_tft_v1_dev]
 extends = env:openevse_wifi_tft_v1
 build_flags =
-  ${env:openevse_wifi_tft_v1.build_flags_openevse}
+  ${common.build_flags_openevse_tft}
   ${common.debug_flags}
   -D DEBUG_PORT=Serial
   -D RAPI_PORT=Serial2
 #upload_protocol = custom
 #upload_command = curl -F firmware=@$SOURCE http://$UPLOAD_PORT/update
 #build_type = debug
-#board_build.partitions = ${common.build_partitions_debug}