diff --git a/platformio.ini b/platformio.ini
index e6b31968c..554c0d1eb 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,7 +11,8 @@
 src_dir = tasmota
 build_dir = .pioenvs
 build_cache_dir = .cache
-extra_configs = platformio_override.ini
+extra_configs = platformio_tasmota_env.ini
+                platformio_override.ini
 
 ; *** Build/upload environment
 default_envs = 
@@ -106,103 +107,3 @@ build_flags               = ${esp82xx_defaults.build_flags}
 ; No exception code in firmware
                             -fno-exceptions
                             -lstdc++
-
-[env]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags}
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota]
-
-[env:tasmota-minimal]
-build_flags = ${common.build_flags} -DFIRMWARE_MINIMAL
-
-[env:tasmota-basic]
-build_flags = ${common.build_flags} -DFIRMWARE_BASIC
-
-[env:tasmota-knx]
-build_flags = ${common.build_flags} -DFIRMWARE_KNX_NO_EMULATION
-
-[env:tasmota-sensors]
-build_flags = ${common.build_flags} -DFIRMWARE_SENSORS
-
-[env:tasmota-display]
-build_flags = ${common.build_flags} -DFIRMWARE_DISPLAYS
-
-[env:tasmota-ir]
-build_flags = ${common.build_flags} -DUSE_IR_REMOTE_FULL -DFIRMWARE_IR
-
-[env:tasmota-ircustom]
-build_flags = ${common.build_flags} -DUSE_IR_REMOTE_FULL
-
-[env:tasmota-BG]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=bg-BG
-
-[env:tasmota-BR]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-BR
-
-[env:tasmota-CN]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-CN
-
-[env:tasmota-CZ]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=cs-CZ
-
-[env:tasmota-DE]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=de-DE
-
-[env:tasmota-ES]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=es-ES
-
-[env:tasmota-FR]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=fr-FR
-
-[env:tasmota-GR]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=el-GR
-
-[env:tasmota-HE]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=he-HE
-
-[env:tasmota-HU]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=hu-HU
-
-[env:tasmota-IT]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=it-IT
-
-[env:tasmota-KO]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=ko-KO
-
-[env:tasmota-NL]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=nl-NL
-
-[env:tasmota-PL]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=pl-PL
-
-[env:tasmota-PT]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-PT
-
-[env:tasmota-RU]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=ru-RU
-
-[env:tasmota-SE]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=sv-SE
-
-[env:tasmota-SK]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=sk-SK
-
-[env:tasmota-TR]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=tr-TR
-
-[env:tasmota-TW]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-TW
-
-[env:tasmota-UK]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=uk-UK