diff --git a/code/platformio.ini b/code/platformio.ini
index 7506770a..33e48b2b 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -250,15 +250,32 @@ upload_flags = ${common.ota_upload_flags}
 board = ${common.board_4m}
 build_flags = ${common.build_flags_4m1m} -DNODEMCU_LOLIN -DDEBUG_FAUXMO=Serial -DNOWSAUTH
 
-[env:nodemcu-lolin-252]
-platform = ${common.arduino_core_2_5_2}
+[env:nodemcu-lolin-latest]
+platform = ${common.platform_latest}
 board = ${common.board_4m}
 build_flags = ${common.build_flags_4m1m} -DNODEMCU_LOLIN -DDEBUG_FAUXMO=Serial -DNOWSAUTH
 
 [env:nodemcu-lolin-ssl]
 platform = ${common.platform_latest}
 board = ${common.board_4m}
-build_flags = ${common.build_flags_4m1m} -DNODEMCU_LOLIN -DDEBUG_FAUXMO=Serial -DNOWSAUTH -DASYNC_TCP_SSL_ENABLED=1
+build_flags =
+    ${common.build_flags_4m1m}
+    -DDEBUG_FAUXMO=Serial
+    -DASYNC_TCP_SSL_ENABLED=1
+src_build_flags =
+    -DNODEMCU_LOLIN -DNOWSAUTH
+
+[env:nodemcu-lolin-secure-client]
+platform = ${common.platform_latest}
+board = ${common.board_4m}
+build_flags =
+    ${common.build_flags_4m1m}
+    -DDEBUG_FAUXMO=Serial
+src_build_flags =
+    -DNODEMCU_LOLIN -DNOWSAUTH
+    -DSECURE_CLIENT=SECURE_CLIENT_BEARSSL
+    -DMQTT_LIBRARY=MQTT_LIBRARY_ARDUINOMQTT
+    -DOTA_CLIENT=OTA_CLIENT_HTTPUPDATE
 
 [env:nodemcu-lolin-ota]
 board = ${common.board_4m}