diff --git a/user_setups/esp32/ttgo-lilygo-pi_ili9481.ini b/user_setups/esp32/ttgo-lilygo-pi_ili9481.ini
index 1622a844..e9d32cf0 100644
--- a/user_setups/esp32/ttgo-lilygo-pi_ili9481.ini
+++ b/user_setups/esp32/ttgo-lilygo-pi_ili9481.ini
@@ -6,13 +6,9 @@
 ;***************************************************;
 
 [env:ttgo-lilygo-pi_ili9481]
-extends = esp32_16mb
+extends = esp32_16mb_v2
 board = esp32dev
 
-#platform  = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
-#platform_packages =
-#   framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.0
-
 build_flags =
     ${env.build_flags}
     ${esp32.build_flags}
@@ -55,12 +51,12 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ${lovyangfx.lib_deps}
     ${goodix.lib_deps}
-    adafruit/Adafruit GFX Library @ ^1.10.3
-    adafruit/Adafruit BusIO @ ^1.6.0
 
 lib_ignore =
     ${env.lib_ignore}
     ${esp32.lib_ignore}
+    ${arduino_esp32_v2.lib_ignore}
 ;endregion
diff --git a/user_setups/esp32/ttgo-lilygo-pi_st7796.ini b/user_setups/esp32/ttgo-lilygo-pi_st7796.ini
index 3f21d84b..1d69ab87 100644
--- a/user_setups/esp32/ttgo-lilygo-pi_st7796.ini
+++ b/user_setups/esp32/ttgo-lilygo-pi_st7796.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:ttgo-lilygo-pi_st7796]
-extends = esp32_16mb
+extends = esp32_16mb_v2
 board = esp32dev
 
 build_flags =
@@ -49,12 +49,12 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ${lovyangfx.lib_deps}
     ${ft6336.lib_deps}
-    adafruit/Adafruit GFX Library @ ^1.10.3
-    adafruit/Adafruit BusIO @ ^1.6.0
 
 lib_ignore =
     ${env.lib_ignore}
     ${esp32.lib_ignore}
+    ${arduino_esp32_v2.lib_ignore}
 ;endregion