diff --git a/platformio.ini b/platformio.ini
index 9b63cd51..7d1b65db 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -75,7 +75,7 @@ build_flags =
     -D HASP_VER_MAJ=0
     -D HASP_VER_MIN=7
     ;-D HASP_VER_REV=4
-    -D HASP_VER_REV=0-rc4
+    -D HASP_VER_REV=0-rc5
     ;-D HASP_VER_REV=4-rc1
     ${override.build_flags}
 
diff --git a/platformio_override-template.ini b/platformio_override-template.ini
index 08581726..f7fc0a8a 100644
--- a/platformio_override-template.ini
+++ b/platformio_override-template.ini
@@ -58,8 +58,8 @@ extra_default_envs =
     ; nodemcu32s-raspi
     ; s2-mini-esp32s2_ili9341
     ; ttgo_esp32_poe-ili9341
-    ; ttgo-lilygo-pi_ili9481
-    ; ttgo-lilygo-pi_st7796
+    ; lilygo-lily-pi_ili9481
+    ; lilygo-lily-pi_st7796
     ; ttgo-t7-v1_5_ili9341_16MB
     ; ttgo-t7-v1_5_ili9341_4MB
     ; ttgo-esp32_tdisplay_v1
@@ -117,14 +117,12 @@ upload_flags = --port=3232 ; --auth=haspadmin   ; OTA password
 
 ;region -- Custom Environment configuration example -----------------
 [env:my_custom_build]
-extends = arduino_esp32_v2
+extends = arduino_esp32_v2, flash_4mb
 board = nodemcu-32s
 
 upload_port = COM12     ; To change the port, use platform_override.ini
 monitor_port = COM12    ; To change the port, use platform_override.ini
 
-board_build.partitions = user_setups/esp32/partitions_4MB.csv ; default.csv
-
 debug_tool = esp-prog
 debug_init_break = tbreak setup
 build_flags =
diff --git a/user_setups/esp32/esp32cam_st7796.ini b/user_setups/esp32/esp32cam_st7796.ini
index 7a314fc8..cab73d7a 100644
--- a/user_setups/esp32/esp32cam_st7796.ini
+++ b/user_setups/esp32/esp32cam_st7796.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:esp32cam-st7796]
-extends = esp32_4mb
+extends = arduino_esp32_v2, flash_4mb
 board = esp32cam
 
 ;ESP32 CAM PINS
diff --git a/user_setups/esp32/nodemcu-32s_st7796.ini b/user_setups/esp32/nodemcu-32s_st7796.ini
index cfc745e2..787e5184 100644
--- a/user_setups/esp32/nodemcu-32s_st7796.ini
+++ b/user_setups/esp32/nodemcu-32s_st7796.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:nodemcu32s-raspi]
-extends = esp32_4mb
+extends = arduino_esp32_v2, flash_4mb
 board = nodemcu-32s
 
 build_flags =
diff --git a/user_setups/esp32s2/s2-mini-esp32s2_ili9341.ini b/user_setups/esp32s2/s2-mini-esp32s2_ili9341.ini
index f5493a84..88bbc5f5 100644
--- a/user_setups/esp32s2/s2-mini-esp32s2_ili9341.ini
+++ b/user_setups/esp32s2/s2-mini-esp32s2_ili9341.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:s2-mini-esp32s2_ili9341]
-extends = esp32s2_4mb_v2
+extends = arduino_esp32s2-solo_v2, flash_4mb
 board = esp32s2_solo1
 
 build_flags =