diff --git a/general/overlay/etc/network/interfaces.d/wlan0 b/general/overlay/etc/network/interfaces.d/wlan0
index a879a5df..cc9f06c1 100644
--- a/general/overlay/etc/network/interfaces.d/wlan0
+++ b/general/overlay/etc/network/interfaces.d/wlan0
@@ -1,4 +1,3 @@
-auto wlan0
 iface wlan0 inet dhcp
     pre-up wpa_passphrase "$(fw_printenv -n wlanssid || echo OpenIPC)" "$(fw_printenv -n wlanpass || echo OpenIPC12345)" > /tmp/wpa_supplicant.conf
     pre-up sed -i '2i \\tscan_ssid=1' /tmp/wpa_supplicant.conf
diff --git a/general/overlay/etc/wireless/interfaces/wlan0 b/general/overlay/etc/wireless/interfaces/wlan0
new file mode 100644
index 00000000..a879a5df
--- /dev/null
+++ b/general/overlay/etc/wireless/interfaces/wlan0
@@ -0,0 +1,6 @@
+auto wlan0
+iface wlan0 inet dhcp
+    pre-up wpa_passphrase "$(fw_printenv -n wlanssid || echo OpenIPC)" "$(fw_printenv -n wlanpass || echo OpenIPC12345)" > /tmp/wpa_supplicant.conf
+    pre-up sed -i '2i \\tscan_ssid=1' /tmp/wpa_supplicant.conf
+    pre-up wpa_supplicant -D nl80211,wext -i wlan0 -c /tmp/wpa_supplicant.conf -B
+    post-down killall -q wpa_supplicant
diff --git a/general/package/busybox/busybox.config b/general/package/busybox/busybox.config
index ff9bef5f..6f249076 100644
--- a/general/package/busybox/busybox.config
+++ b/general/package/busybox/busybox.config
@@ -1030,7 +1030,7 @@ CONFIG_UDHCP_DEBUG=0
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 CONFIG_FEATURE_UDHCP_RFC3397=y
 CONFIG_FEATURE_UDHCP_8021Q=y
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-x hostname:$(hostname) -T 1 -t 15 -R -b -O search"
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-x hostname:$(hostname) -A 0 -T 1 -t 1 -R -b -O search"
 
 #
 # Print Utilities