diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd588587..b5fb5a14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+### Changed
+- Using unreleased AsyncMqttClient with stability improvements
+
 ## [1.1.0] 2016-12-06
 ### Added
 - Added support for DS18B20 temperature sensor. Thanks to Francesco Boscarino
diff --git a/code/platformio.custom.ini b/code/platformio.custom.ini
index 68ff6edd..d5e637fe 100644
--- a/code/platformio.custom.ini
+++ b/code/platformio.custom.ini
@@ -21,7 +21,7 @@ lib_deps =
     ArduinoJson
     ESPAsyncTCP
     ESPAsyncWebServer
-    AsyncMqttClient
+    https://github.com/marvinroger/async-mqtt-client
     ESPAsyncUDP
     Embedis
     NtpClientLib
@@ -117,15 +117,6 @@ build_flags = -DESP_RELAY_BOARD -DENABLE_FAUXMO=1 -DENABLE_DHT=1
 
 # ------------------------------------------------------------------------------
 
-[env:ac-device]
-topic = /home/cellar/airconditioner/ip
-include = env:s20-debug-ota
-
-[env:washer-device]
-topic = /home/cellar/washer/ip
-include = env:sonoff-debug-ota
-build_flags = -g -Wl,-Tesp8266.flash.1m128.ld -DDEBUG_PORT=Serial -DSONOFF -DENABLE_EMON=1 -DENABLE_DHT=1
-
 [env:studio-lamp-device]
 topic = /home/studio/lamp/ip
 include = env:sonoff-debug-ota
diff --git a/code/platformio.ini b/code/platformio.ini
index ccb3536d..891e42c7 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -9,7 +9,7 @@ lib_deps =
     ArduinoJson
     ESPAsyncTCP
     ESPAsyncWebServer
-    AsyncMqttClient
+    https://github.com/marvinroger/async-mqtt-client
     ESPAsyncUDP
     Embedis
     NtpClientLib
@@ -192,32 +192,6 @@ upload_flags = --auth=fibonacci --port 8266
 
 # ------------------------------------------------------------------------------
 
-[env:ac-device]
-topic = /home/cellar/airconditioner/ip
-platform = espressif8266
-framework = arduino
-board = esp01_1m
-lib_deps = ${common.lib_deps}
-lib_ignore = ${common.lib_ignore}
-extra_script = pio_hooks.py
-build_flags = -g -Wl,-Tesp8266.flash.1m128.ld -DDEBUG_PORT=Serial -DS20
-upload_speed = 115200
-upload_port = "192.168.4.1"
-upload_flags = --auth=fibonacci --port 8266
-
-[env:washer-device]
-topic = /home/cellar/washer/ip
-platform = espressif8266
-framework = arduino
-board = esp01_1m
-lib_deps = ${common.lib_deps}
-lib_ignore = ${common.lib_ignore}
-extra_script = pio_hooks.py
-upload_speed = 115200
-upload_port = "192.168.4.1"
-upload_flags = --auth=fibonacci --port 8266
-build_flags = -g -Wl,-Tesp8266.flash.1m128.ld -DDEBUG_PORT=Serial -DSONOFF -DENABLE_EMON=1 -DENABLE_DHT=1
-
 [env:studio-lamp-device]
 topic = /home/studio/lamp/ip
 platform = espressif8266_stage
@@ -237,7 +211,7 @@ platform = espressif8266_stage
 framework = arduino
 board = esp01_1m
 lib_deps = ${common.lib_deps}
-lib_ignore = ${common.lib_ignore}
+lib_ignore =
 extra_script = pio_hooks.py
 build_flags = -g -Wl,-Tesp8266.flash.1m128.ld -DDEBUG_PORT=Serial -DSONOFF -DENABLE_FAUXMO=1
 upload_speed = 115200