diff --git a/platformio.ini b/platformio.ini
index 01640257e..e2958caa2 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -103,6 +103,7 @@ extra_scripts               = pio/strip-floats.py
 build_unflags               = -Wall
                               -Wdeprecated-declarations
 build_flags                 = -Wno-deprecated-declarations
+                              -mtarget-align
                               -D_IR_ENABLE_DEFAULT_=false
                               -DDECODE_HASH=true -DDECODE_NEC=true -DSEND_NEC=true
                               -DDECODE_RC5=true -DSEND_RC5=true -DDECODE_RC6=true -DSEND_RC6=true
@@ -118,7 +119,6 @@ build_flags                 = ${esp_defaults.build_flags}
                               -Wl,-Map,firmware.map
                               -DCORE_DEBUG_LEVEL=0
                               -DNDEBUG
-                              -mtarget-align
                               -DFP_IN_IROM
                               -DBEARSSL_SSL_BASIC
                               ; NONOSDK22x_190703 = 2.2.2-dev(38a443e)
@@ -139,7 +139,7 @@ build_flags                 = -DUSE_IR_REMOTE_FULL
 
 [core]
 ; *** Esp8266 Tasmota modified Arduino core based on core 2.7.4
-platform                    = espressif8266@2.6.2
+platform                    = espressif8266 @ 2.6.2
 platform_packages           = framework-arduinoespressif8266 @ https://github.com/tasmota/Arduino/releases/download/2.7.4.5/esp8266-2.7.4.5.zip
                               platformio/tool-esptool @ 1.413.0
 build_unflags               = ${esp_defaults.build_unflags}
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index e06d8f0cc..acf9708ff 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -126,7 +126,7 @@ build_flags                 = ${esp82xx_defaults.build_flags}
 
 [core_stage]
 ; *** Esp8266 core for Arduino version stage
-platform_packages           = framework-arduinoespressif8266@https://github.com/esp8266/Arduino.git
+platform_packages           = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
 ; *** Use Xtensa build chain 10.2. GNU13 from https://github.com/earlephilhower/esp-quick-toolchain
                               mcspr/toolchain-xtensa @ 5.100200.200918
                               platformio/tool-esptool @ 1.413.0
@@ -192,10 +192,12 @@ lib_extra_dirs              = ${library.lib_extra_dirs}
 
 [core32_stage]
 platform                    = espressif32 @ 2.0.0
-platform_packages           = tool-esptoolpy@1.20800.0
+platform_packages           = tool-esptoolpy @ 1.20800.0
                               framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#f7fb00632e04d74a7890a77fa7dbbb8ae572e866
 build_unflags               = ${esp32_defaults.build_unflags}
+                              -mtarget-align
 build_flags                 = ${esp32_defaults.build_flags}
+                              -mno-target-align
                               -DESP32_STAGE=true
 
 [library]