diff --git a/platformio.ini b/platformio.ini
index a58abd811..6798a03b5 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,8 +22,8 @@ extra_configs =
   pio_local.ini
 
 [common]
-core_build_flags = -std=gnu++17 -O3 -Wno-type-limits -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -Wno-format
-core_unbuild_flags = -std=gnu++11 -std=gnu++14
+core_build_flags = -std=gnu++17 -O3 -flto=auto -Wno-type-limits -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -Wno-format
+core_unbuild_flags = -std=gnu++11 -std=gnu++14 -fno-lto
 
 my_build_flags =
 
@@ -54,7 +54,7 @@ framework = arduino
 board_build.partitions = partitions/esp32_partition_16M.csv
 board_upload.flash_size = 16MB
 board_build.app_partition_name = app0
-platform = espressif32@6.9.0 ; Arduino Core 2.0.18 / IDF 4.4.8
+platform = espressif32@6.10.0 ; Arduino Core 2.0.17 / IDF 4.4.7
 ; platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.11/platform-espressif32.zip ; Arduino Core 3.1.1 / IDF 5.3.2
 ;
 ; Experimental for building using espidf and the Hybrid mode to remove core libraries.
@@ -89,7 +89,7 @@ framework = arduino
 board_build.partitions = partitions/esp32_partition_32M.csv
 board_upload.flash_size = 32MB
 board_build.app_partition_name = app0
-platform = espressif32@6.9.0 ; Arduino Core 2.0.18 / IDF 4.4.8
+platform = espressif32@6.10.0 ; Arduino Core 2.0.17 / IDF 4.4.7
 
 ; use Tasmota's library for 4MB Flash variants.
 ; Removes libs (like mbedtsl, so no WiFi_secure.h) to increase available heap