diff --git a/code/extra_scripts.py b/code/extra_scripts.py
index 536f112b..6fa667e9 100644
--- a/code/extra_scripts.py
+++ b/code/extra_scripts.py
@@ -97,9 +97,8 @@ def patch_lwip():
     if "lwip_gcc" not in env["LIBS"]:
         return
 
-    framework_dir = env["FRAMEWORK_ARDUINOESP8266_DIR"]
-
     platform = env.PioPlatform()
+    framework_dir = platform.get_package_dir("framework-arduinoespressif8266")
     toolchain_prefix = os.path.join(platform.get_package_dir("toolchain-xtensa"), "bin", "xtensa-lx106-elf-")
 
     patch_action = env.VerboseAction(" ".join([
diff --git a/code/platformio.ini b/code/platformio.ini
index 2c814a36..cacf2001 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -15,7 +15,7 @@ data_dir = espurna/data
 #   arduino core 2.4.2 = platformIO 1.8.0
 #   arduino core 2.5.0 = platformIO 2.0.4
 #   arduino core 2.5.1 = platformIO 2.1.1
-#   arduino core 2.5.2 = platformIO 2.2.1
+#   arduino core 2.5.2 = platformIO 2.2.2
 # ------------------------------------------------------------------------------
 arduino_core_2_3_0 = espressif8266@1.5.0
 arduino_core_2_4_0 = espressif8266@1.6.0
@@ -23,7 +23,11 @@ arduino_core_2_4_1 = espressif8266@1.7.3
 arduino_core_2_4_2 = espressif8266@1.8.0
 arduino_core_2_5_0 = espressif8266@2.0.4
 arduino_core_2_5_1 = espressif8266@2.1.1
-arduino_core_2_5_2 = espressif8266@2.2.1
+arduino_core_2_5_2 = espressif8266@2.2.2
+
+# Development platforms
+arduino_core_develop = https://github.com/platformio/platform-espressif8266#develop
+arduino_core_git = https://github.com/platformio/platform-espressif8266#feature/stage
 
 platform = ${common.arduino_core_2_3_0}
 platform_latest = ${common.arduino_core_2_4_2}