diff --git a/code/platformio.ini b/code/platformio.ini
index 889bf12e..d0e65ed9 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -319,17 +319,13 @@ src_build_flags = -DWEMOS_D1_MINI_RELAYSHIELD -DNOWSAUTH
 extends = env:esp8266-4m-base
 src_build_flags = -DNODEMCU_LOLIN -DNOWSAUTH
 
-[env:nodemcu-lolin-latest]
-extends = env:esp8266-4m-latest-base
-src_build_flags = -DNODEMCU_LOLIN -DNOWSAUTH
-
 [env:nodemcu-lolin-secure-client-asynctcp]
-extends = env:esp8266-4m-latest-base
+extends = env:esp8266-4m-base
 build_flags = ${common.build_flags} -DASYNC_TCP_SSL_ENABLED=1
 src_build_flags = -DNODEMCU_LOLIN -DNOWSAUTH
 
 [env:nodemcu-lolin-secure-client]
-extends = env:esp8266-4m-latest-base
+extends = env:esp8266-4m-base
 board_build.f_cpu = 160000000
 src_build_flags =
 	-DNODEMCU_LOLIN -DNOWSAUTH
@@ -342,23 +338,23 @@ src_build_flags =
 # ------------------------------------------------------------------------------
 
 [env:tinkerman-espurna-h06]
-extends = env:esp8266-4m-latest-base
+extends = env:esp8266-4m-base
 src_build_flags = -DTINKERMAN_ESPURNA_H06
 
 [env:tinkerman-espurna-h08]
-extends = env:esp8266-4m-latest-base
+extends = env:esp8266-4m-base
 src_build_flags = -DTINKERMAN_ESPURNA_H08
 
 [env:tinkerman-espurna-switch]
-extends = env:esp8266-4m-latest-base
+extends = env:esp8266-4m-base
 src_build_flags = -DTINKERMAN_ESPURNA_SWITCH
 
 [env:wemos-d1-tarpunashield]
-extends = env:esp8266-4m-latest-base
+extends = env:esp8266-4m-base
 src_build_flags = -DWEMOS_D1_TARPUNA_SHIELD
 
 [env:tinkerman-rfm69gw]
-extends = env:esp8266-4m-latest-base
+extends = env:esp8266-4m-base
 board = esp12e
 src_build_flags = -DTINKERMAN_RFM69GW -DNOWSAUTH
 
@@ -397,11 +393,11 @@ extends = env:esp8266-1m-base
 src_build_flags = -DGENERIC_ESP01S_DS18B20_V10
 
 [env:generic-esp01s-pzem004t]
-extends = env:esp8266-1m-latest-base
+extends = env:esp8266-1m-base
 src_build_flags = -DGENERIC_PZEM004T -DDISABLE_POSTMORTEM_STACKDUMP
 
 [env:generic-esp12e-pzem004t]
-extends = env:esp8266-4m-latest-base
+extends = env:esp8266-4m-base
 src_build_flags = -DGENERIC_PZEM004T -DDISABLE_POSTMORTEM_STACKDUMP
 
 # ------------------------------------------------------------------------------