diff --git a/buildroot-external/busybox.config b/buildroot-external/busybox.config
index 0382305dd..33f80ec5f 100644
--- a/buildroot-external/busybox.config
+++ b/buildroot-external/busybox.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.27.2
-# Thu Mar 29 20:23:02 2018
+# Sun Apr  1 21:18:49 2018
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -760,18 +760,18 @@ CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
 # CONFIG_I2CDUMP is not set
 # CONFIG_I2CDETECT is not set
 # CONFIG_INOTIFYD is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-CONFIG_FEATURE_LESS_TRUNCATE=y
-CONFIG_FEATURE_LESS_MARKS=y
-CONFIG_FEATURE_LESS_REGEXP=y
-CONFIG_FEATURE_LESS_WINCH=y
-CONFIG_FEATURE_LESS_ASK_TERMINAL=y
-CONFIG_FEATURE_LESS_DASHCMD=y
-CONFIG_FEATURE_LESS_LINENUMS=y
-CONFIG_LSSCSI=y
+# CONFIG_LESS is not set
+CONFIG_FEATURE_LESS_MAXLINES=0
+# CONFIG_FEATURE_LESS_BRACKETS is not set
+# CONFIG_FEATURE_LESS_FLAGS is not set
+# CONFIG_FEATURE_LESS_TRUNCATE is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_FEATURE_LESS_WINCH is not set
+# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
+# CONFIG_FEATURE_LESS_DASHCMD is not set
+# CONFIG_FEATURE_LESS_LINENUMS is not set
+# CONFIG_LSSCSI is not set
 # CONFIG_MAKEDEVS is not set
 # CONFIG_FEATURE_MAKEDEVS_LEAF is not set
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
@@ -797,7 +797,7 @@ CONFIG_UBIRMVOL=y
 CONFIG_UBIRSVOL=y
 CONFIG_UBIUPDATEVOL=y
 CONFIG_UBIRENAME=y
-CONFIG_VOLNAME=y
+# CONFIG_VOLNAME is not set
 CONFIG_WATCHDOG=y
 
 #
@@ -858,20 +858,20 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
 # CONFIG_FEATURE_INETD_RPC is not set
-# CONFIG_IP is not set
+CONFIG_IP=y
 # CONFIG_IPADDR is not set
 # CONFIG_IPLINK is not set
 # CONFIG_IPROUTE is not set
 # CONFIG_IPTUNNEL is not set
 # CONFIG_IPRULE is not set
 # CONFIG_IPNEIGH is not set
-# CONFIG_FEATURE_IP_ADDRESS is not set
-# CONFIG_FEATURE_IP_LINK is not set
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
 # CONFIG_FEATURE_IP_ROUTE is not set
 CONFIG_FEATURE_IP_ROUTE_DIR=""
 # CONFIG_FEATURE_IP_TUNNEL is not set
 # CONFIG_FEATURE_IP_RULE is not set
-# CONFIG_FEATURE_IP_NEIGH is not set
+CONFIG_FEATURE_IP_NEIGH=y
 # CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
 # CONFIG_IPCALC is not set
 # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
@@ -884,15 +884,15 @@ CONFIG_FEATURE_IP_ROUTE_DIR=""
 # CONFIG_NC_SERVER is not set
 # CONFIG_NC_EXTRA is not set
 # CONFIG_NC_110_COMPAT is not set
-# CONFIG_NETSTAT is not set
-# CONFIG_FEATURE_NETSTAT_WIDE is not set
-# CONFIG_FEATURE_NETSTAT_PRG is not set
-# CONFIG_NSLOOKUP is not set
+CONFIG_NETSTAT=y
+CONFIG_FEATURE_NETSTAT_WIDE=y
+CONFIG_FEATURE_NETSTAT_PRG=y
+CONFIG_NSLOOKUP=y
 # CONFIG_NTPD is not set
 # CONFIG_FEATURE_NTPD_SERVER is not set
 # CONFIG_FEATURE_NTPD_CONF is not set
-# CONFIG_PING is not set
-# CONFIG_PING6 is not set
+CONFIG_PING=y
+CONFIG_PING6=y
 # CONFIG_FEATURE_FANCY_PING is not set
 # CONFIG_PSCAN is not set
 # CONFIG_ROUTE is not set
diff --git a/buildroot-external/rootfs-overlay/etc/NetworkManager/NetworkManager.conf b/buildroot-external/rootfs-overlay/etc/NetworkManager/NetworkManager.conf
new file mode 100644
index 000000000..98734b707
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/NetworkManager/NetworkManager.conf
@@ -0,0 +1,7 @@
+[main]
+dns=default
+plugins=keyfile
+autoconnect-retries-default=0
+
+[keyfile]
+unmanaged-devices=type:bridge;type:tun;type:veth
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassio.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassio.conf
index 01416c5a5..c450bd77c 100644
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassio.conf
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassio.conf
@@ -1,3 +1,2 @@
 [unit]
-Requires=etc-docker.mount var-lib-docker.mount
-After=etc-docker.mount var-lib-docker.mount
+RequiresMountsFor=/etc/docker /var/lib/docker
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/dropbear.service.d/hassio.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/dropbear.service.d/hassio.conf
index 3c8d92934..82979a7c0 100644
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/dropbear.service.d/hassio.conf
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/dropbear.service.d/hassio.conf
@@ -1,7 +1,7 @@
 [unit]
-Requires=etc-dropbear.mount
-After=etc-dropbear.mount
+RequiresMountsFor=/etc/dropbear
 
 [Service]
 ExecStartPre=
-ExecStart=-/usr/sbin/dropbear -F -R -E -p 22222 -s
+ExecStart=
+ExecStart=/usr/sbin/dropbear -F -R -E -p 22222 -s