diff --git a/platformio.ini b/platformio.ini
index 6a3820d02..f29d5f363 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -87,17 +87,21 @@ extra_scripts             = pio/strip-floats.py
                             pio/name-firmware.py
                             pio/gzip-firmware.py
 
-[esp82xx_defaults]
-build_flags               = -D NDEBUG
-                            -mtarget-align
-                            -Wl,-Map,firmware.map
-                            -DFP_IN_IROM
-; new mechanism to set the IRremoteESP8266 supported protocols: none except HASH, NEC, RC5, RC6
-                            -D_IR_ENABLE_DEFAULT_=false
+[esp_defaults]
+build_flags               = -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
+; new mechanism to set the IRremoteESP8266 supported protocols: none except HASH, NEC, RC5, RC6
 
-[irremoteesp8266_full]
+[esp82xx_defaults]
+build_flags               = ${esp_defaults.build_flags}
+                            -Wl,-Map,firmware.map
+                            -D NDEBUG
+                            -mtarget-align
+                            -DFP_IN_IROM
+
+
+[irremoteesp_full]
 build_flags               = -DUSE_IR_REMOTE_FULL
                             -U_IR_ENABLE_DEFAULT_
                             -DDECODE_PRONTO=false -DSEND_PRONTO=false
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 11c0d7ee0..8fdb61495 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -54,7 +54,7 @@ build_flags               = ${core_active.build_flags}
 upload_port               = COM5
 
 extra_scripts             = ${scripts_defaults.extra_scripts}
-                            pio/obj-dump.py
+;                            pio/obj-dump.py
 
 ; *** Upload file to OTA server using SCP
 ;upload_port               = user@host:/path
@@ -240,7 +240,7 @@ upload_resetmethod      = ${common.upload_resetmethod}
 upload_speed            = 921600
 extra_scripts           = ${common.extra_scripts}
 
-build_flags =
+build_flags             = ${esp_defaults.build_flags}
     -D BUFFER_LENGTH=128
     -D MQTT_MAX_PACKET_SIZE=1200
     -D uint32=uint32_t
diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini
index a09f01ecd..f122eae1b 100644
--- a/platformio_tasmota_env.ini
+++ b/platformio_tasmota_env.ini
@@ -32,10 +32,10 @@ build_flags = ${common.build_flags} -DFIRMWARE_SENSORS
 build_flags = ${common.build_flags} -DFIRMWARE_DISPLAYS
 
 [env:tasmota-ir]
-build_flags = ${common.build_flags} ${irremoteesp8266_full.build_flags} -DFIRMWARE_IR
+build_flags = ${common.build_flags} ${irremoteesp_full.build_flags} -DFIRMWARE_IR
 
 [env:tasmota-ircustom]
-build_flags = ${common.build_flags} ${irremoteesp8266_full.build_flags}
+build_flags = ${common.build_flags} ${irremoteesp_full.build_flags}
 
 [env:tasmota-BG]
 build_flags = ${common.build_flags} -DMY_LANGUAGE=bg-BG
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 4f6661c17..71bef8558 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -129,7 +129,7 @@ extra_scripts           = ${common32.extra_scripts}
 lib_extra_dirs          = ${common32.lib_extra_dirs}
 lib_ignore              = ${common32.lib_ignore}
 build_unflags           = ${common32.build_unflags}
-build_flags             = ${common32.build_flags} ${irremoteesp8266_full.build_flags} -DFIRMWARE_IR
+build_flags             = ${common32.build_flags} ${irremoteesp_full.build_flags} -DFIRMWARE_IR
 
 [env:tasmota32-ircustom]
 framework               = ${common.framework}
@@ -148,7 +148,7 @@ extra_scripts           = ${common32.extra_scripts}
 lib_extra_dirs          = ${common32.lib_extra_dirs}
 lib_ignore              = ${common32.lib_ignore}
 build_unflags           = ${common32.build_unflags}
-build_flags             = ${common32.build_flags} ${irremoteesp8266_full.build_flags}
+build_flags             = ${common32.build_flags} ${irremoteesp_full.build_flags}
 
 [env:tasmota32-BG]
 framework               = ${common.framework}