diff --git a/platformio.ini b/platformio.ini
index c0600a74..b348e157 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -424,16 +424,19 @@ upload_command = curl -F firmware=@$SOURCE http://$UPLOAD_PORT/update
 
 [env:openevse_wifi_tft_v1]
 board = denky32
-build_flags =
+build_flags_openevse =
   ${common.build_flags}
   ${common.src_build_flags}
-  -D DEBUG_PORT=Serial2
-  -D RAPI_PORT=Serial
+  ${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}
+  -D DEBUG_PORT=Serial2
+  -D RAPI_PORT=Serial
 lib_deps =
   ${common.lib_deps}
   ${common.gfx_display_libs}
@@ -442,10 +445,11 @@ lib_deps =
 [env:openevse_wifi_tft_v1_dev]
 extends = env:openevse_wifi_tft_v1
 build_flags =
-  ${env:openevse_wifi_tft_v1.build_flags}
+  ${env:openevse_wifi_tft_v1.build_flags_openevse}
   ${common.debug_flags}
-  ${common.gfx_display_build_flags}
-upload_protocol = custom
-upload_command = curl -F firmware=@$SOURCE http://$UPLOAD_PORT/update
+  -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}