diff --git a/platformio.ini b/platformio.ini
index 1fe055652025..fb6bb98e5aed 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -12,42 +12,32 @@ src_dir = sonoff
 
 ; Uncomment one of the lines below to build/upload only one environment
 ;env_default = sonoff
-;env_default = sonoff-touch-4ch-bnsz
 ;env_default = sonoff-minimal
 ;env_default = sonoff-ds18x20
 
-; Sonoff et al (ESP8266 based)
+; Sonoff et al
 [env:sonoff]
 platform = espressif8266
 framework = arduino
 board = esp01_1m
-board_flash_mode = qio
-build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMQTT_MAX_PACKET_SIZE=512
-lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON
-
-; Sonoff Touch, Sonoff 4CH and Sonoff BN-SZ01 (ESP8285 based)
-[env:sonoff-touch-4ch-bnsz]
-platform = espressif8266
-framework = arduino
-board = esp01_1m
 board_flash_mode = dout
 build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMQTT_MAX_PACKET_SIZE=512
 lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON
 
-; Sonoff minimal (ESP8266 based)
+; Sonoff minimal
 [env:sonoff-minimal] ; Placeholder to be configured
 platform = espressif8266
 framework = arduino
 board = esp01_1m
-board_flash_mode = qio
+board_flash_mode = dout
 build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMQTT_MAX_PACKET_SIZE=512 -DBE_MINIMAL
 lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON
 
-; Sonoff multiple DS18x20 (ESP8266 based)
+; Sonoff multiple DS18x20
 [env:sonoff-ds18x20]
 platform = espressif8266
 framework = arduino
 board = esp01_1m
-board_flash_mode = qio
+board_flash_mode = dout
 build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMQTT_MAX_PACKET_SIZE=758 -DUSE_DS18x20 -DMESSZ=600
 lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON, OneWire