diff --git a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
index 91552272c8..abc663b9ec 100644
--- a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
@@ -20,12 +20,9 @@ Tag="icon-docker"
 // Add the Docker JSON client
 require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
 
-$DockerClient  = new DockerClient();
+$DockerClient = new DockerClient();
 exec("/etc/rc.d/rc.docker status >/dev/null",$dummy,$DockerStopped);
 
-exec("ls --indicator-style=none /sys/class/net|awk '/^br[0-9]+$/'",$nics);
-$bridge = count($nics)>0;
-
 function strposX($s, $c, $n=1) {
   $p = 0;
   while ($n && $p=strpos($s,$c,$p)!==false) {$n--; $p+=strlen($c);}
@@ -34,22 +31,29 @@ function strposX($s, $c, $n=1) {
 
 unset($custom,$other);
 exec("ls --indicator-style=none /sys/class/net|grep -P '^br[0-9]'",$custom);
-exec("ls --indicator-style=none /sys/class/net|grep -P '^(bond|eth)[0-9]'",$other);
+exec("ls --indicator-style=none /sys/class/net|grep -P '^(bond|eth|wlan)[0-9]'",$other);
+$bridge = count($custom)>0;
 $slaves = [];
+
 foreach ($other as $network) {
   if (substr($network,0,4)=='bond') {
     $br = str_replace('bond','br',$network);
     $bond = "/sys/class/net/$network/bonding/slaves";
     if (file_exists($bond)) $slaves = array_merge($slaves,explode(' ',str_replace("\n","",file_get_contents($bond))));
     if (!in_array($br,$custom)) $custom[] = $network;
-  } else {
+  } elseif (substr($network,0,3)=='eth') {
     $br = str_replace('eth','br',$network);
     $bond = str_replace('eth','bond',$network);
     if (!in_array($br,$custom) && !in_array($bond,$custom)) $custom[] = $network;
+  } else {
+    $custom[] = $network;
   }
 }
-$include = $include6 = $address = $address6 = $gateway = $gateway6 = $unset = $protocol = [];
-$wide = false;
+
+$include   = $include6 = $address = $address6 = $gateway = $gateway6 = $unset = $protocol = [];
+$wide      = false;
+$wlan      = (array)@parse_ini_file('/var/local/emhttp/wireless.ini');
+
 foreach ($custom as $network) {
   if (in_array($network,$slaves)) continue;
   $ip4    = exec("ip -4 -br addr show $network scope global | awk '{print $3;exit}'");
@@ -58,12 +62,16 @@ foreach ($custom as $network) {
   $gw6    = $ip6 ? exec("ip -6 route show dev $network default | awk '{print $3;exit}'") : '';
   $route4 = $ip4 ? exec("ip -4 route show dev $network $ip4 | awk '{print $1;exit}'") : '';
   $route6 = $ip6 ? exec("ip -6 route show dev $network | awk '/^".substr($ip6,0,strposX($ip6,':',4))."/{print $1;exit}'") : '';
-  [$eth,$vlan] = my_explode('.',$network);
-  $eth = str_replace(['bond','br'],'eth',$eth);
-  if (!$vlan) {
-    $protocol[$network] = _var($$eth,'PROTOCOL:0','ipv4');
+  if (substr($network,0,4) != 'wlan') {
+    [$eth,$vlan] = my_explode('.',$network);
+    $eth = str_replace(['bond','br'],'eth',$eth);
+    if (!$vlan) {
+      $protocol[$network] = _var($$eth,'PROTOCOL:0','ipv4');
+    } else {
+      foreach ($$eth as $key => $value) if (strpos($key,'VLANID')!==false && $value==$vlan) {$protocol[$network] = _var($$eth,str_replace('VLANID','PROTOCOL',$key),'ipv4'); break;}
+    }
   } else {
-    foreach ($$eth as $key => $value) if (strpos($key,'VLANID')!==false && $value==$vlan) {$protocol[$network] = _var($$eth,str_replace('VLANID','PROTOCOL',$key),'ipv4'); break;}
+    $protocol[$network] = empty($wlan['IP6']) ? 'ipv4' : 'ipv4+ipv6';
   }
   if ($ip4 && $route4) {
     $include[$network] = $route4;
@@ -89,22 +97,34 @@ $unset = array_unique($unset);
 function normalize($network) {
   return strtoupper(str_replace('.','_',$network));
 }
+
 function base_min($route) {
   [$net,$mask] = my_explode('/',$route);
   $mask = 32-$mask;
   return explode('.',long2ip((ip2long($net)>>$mask)<<$mask));
 }
+
 function base_max($route) {
   [$net,$mask] = my_explode('/',$route);
   $mask = 32-$mask;
   return explode('.',long2ip(((ip2long($net)>>$mask)<<$mask)+pow(2,$mask)-1));
 }
+
 function base_net($route) {
   return substr(explode('/',$route)[0],0,-2);
 }
+function hide_wlan($network) {
+  return $network=='wlan0' && lan_port(DockerUtil::port(),true)==1;
+}
+
+function hide_eth($network) {
+  $mgmt_port = ['br0','bond0','eth0'];
+  return in_array($network,$mgmt_port) && lan_port('wlan0',true)==1;
+}
+
 $bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';
 
-//Check if docker.cfg not exists
+//Check if docker.cfg does exist
 $no_dockercfg = !is_file('/boot/config/docker.cfg');
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.filetree.css')?>">
@@ -285,16 +305,20 @@ _(Preserve user defined networks)_:
 $net = normalize($network);
 $docker_auto = "DOCKER_AUTO_$net";
 $docker_dhcp = "DOCKER_DHCP_$net";
+$hide_wlan   = hide_wlan($network);
 ?>
-
 <input type="hidden" name="<?=$docker_auto?>" value="<?=_var($dockercfg,$docker_auto)?>">
 
+<?if ($hide_wlan):?>
+<div markdown="1" style="display:none">
+<?endif;?>
+
 _(IPv4 custom network on interface)_ <?=$network?> (_(optional)_):
 <?
   $auto = _var($dockercfg,$docker_auto)!='no';
-  $autoDisabled = $auto ? '':'disabled';
+  $autoDisabled = $auto ? '' : 'disabled';
   $dhcp = _var($dockercfg,$docker_dhcp);
-  $dhcpDisabled = ($auto && $dhcp) ? '':'disabled';
+  $dhcpDisabled = ($auto && $dhcp) ? '' : 'disabled';
   $net = base_min($route);
   $max = base_max($route);
   $mask = explode('/',$route)[1];
@@ -333,7 +357,11 @@ _(IPv4 custom network on interface)_ <?=$network?> (_(optional)_):
   echo "<input type=\"hidden\" name=\"$docker_dhcp\" value=\"\">";
 ?>
 
+<?if ($hide_wlan):?>
+</div>
+<?endif;?>
 <?endforeach;?>
+
 <?if ($include):?>
 :docker_include_interface_vlan_ipv4_help:
 
@@ -342,11 +370,15 @@ _(IPv4 custom network on interface)_ <?=$network?> (_(optional)_):
 <?
 $port = normalize($network);
 [$subnet,$mask] = my_explode('/',_var($dockercfg,"DOCKER_SUBNET_$port"));
-[$range,$size] = my_explode('/',_var($dockercfg,"DOCKER_RANGE_$port"));
-$disabled = $subnet ? '':'disabled';
-$dhcpDisabled = $range ? '':'disabled';
+[$range,$size]  = my_explode('/',_var($dockercfg,"DOCKER_RANGE_$port"));
+$disabled       = $subnet ? '':'disabled';
+$dhcpDisabled   = $range ? '':'disabled';
+$hide_eth       = hide_eth($network);
 ?>
 <?if ($protocol[$network] != 'ipv6'):?>
+<?if ($hide_eth):?>
+<div markdown="1" style="display:none">
+<?endif;?>
 
 _(IPv4 custom network on interface)_ <?=$network?> (_(optional)_):
 : <input type="checkbox" id="DOCKER_CUSTOM_<?=$port?>_edit" onchange="changeCustom(this.id,4)"<?=$subnet?'checked':''?>><span id="DOCKER_CUSTOM_<?=$port?>_line" class="<?=$subnet?'':'disabled'?>">
@@ -361,6 +393,9 @@ _(IPv4 custom network on interface)_ <?=$network?> (_(optional)_):
   <?for ($m=16; $m<=30; $m++) echo mk_option($size?:25,$m,$m)?></select>
   <span id="DOCKER_CUSTOM_<?=$port?>_hosts" style="<?=$subnet?'':'display:none'?>">(<?=pow(2,32-($size?:25))?> _(hosts)_)</span></span>
 
+<?endif;?>
+<?if ($hide_eth):?>
+</div>
 <?endif;?>
 <?endforeach;?>
 <?if ($unset && $protocol[$network] != 'ipv6'):?>
@@ -373,9 +408,13 @@ _(IPv4 custom network on interface)_ <?=$network?> (_(optional)_):
 <?foreach ($include6 as $network => $route):?>
 <?
 $net = normalize($network);
-$docker_auto = "DOCKER_AUTO_$net";
+$docker_auto  = "DOCKER_AUTO_$net";
 $docker_dhcp6 = "DOCKER_DHCP6_$net";
+$hide_wlan    = hide_wlan($network);
 ?>
+<?if ($hide_wlan):?>
+<div markdown="1" style="display:none">
+<?endif;?>
 
 _(IPv6 custom network on interface)_ <?=$network?> (_(optional)_):
 <?
@@ -393,6 +432,9 @@ _(IPv6 custom network on interface)_ <?=$network?> (_(optional)_):
   <span class="ip6">**_(Subnet)_:** <?=$route?></span>
   <span class="gw6">**_(Gateway)_:** <?=$gateway6[$network]?></span>
 
+<?if ($hide_wlan):?>
+</div>
+<?endif;?>
 <?endforeach;?>
 <?if ($include6):?>
 :docker_include_interface_vlan_ipv6_help:
@@ -402,11 +444,15 @@ _(IPv6 custom network on interface)_ <?=$network?> (_(optional)_):
 <?
 $port = normalize($network);
 [$subnet6,$mask6] = my_explode('/',_var($dockercfg,"DOCKER_SUBNET6_$port"));
-[$range6,$size6] = my_explode('/',_var($dockercfg,"DOCKER_RANGE6_$port"));
-$disabled = $subnet6 ? '':'disabled';
-$dhcpDisabled = $range6 ? '':'disabled';
+[$range6,$size6]  = my_explode('/',_var($dockercfg,"DOCKER_RANGE6_$port"));
+$disabled         = $subnet6 ? '':'disabled';
+$dhcpDisabled     = $range6 ? '':'disabled';
+$hide_eth         = hide_eth($network);
 ?>
 <?if ($protocol[$network] != 'ipv4'):?>
+<?if ($hide_eth):?>
+<div markdown="1" style="display:none">
+<?endif;?>
 
 _(IPv6 custom network on interface)_ <?=$network?> (_(optional)_):
 : <input type="checkbox" id="DOCKER_CUSTOM6_<?=$port?>_edit" onchange="changeCustom(this.id,6)"<?=$subnet6?'checked':''?>><span id="DOCKER_CUSTOM6_<?=$port?>_line" class="<?=$subnet6?'':'disabled'?>">
@@ -415,6 +461,9 @@ _(IPv6 custom network on interface)_ <?=$network?> (_(optional)_):
   <?for ($m=64; $m<=120; $m+=8) echo mk_option($mask6?:64,$m,$m)?></select></span>
   <span class="gw6">**_(Gateway)_:**<input type="text" id="DOCKER_CUSTOM6_<?=$port?>_gw" name="DOCKER_GATEWAY6_<?=$port?>" class="gw6" value="<?=_var($dockercfg,"DOCKER_GATEWAY6_$port")?>" title="_(IPv6 address nnnn:xxxx::yyyy)_"<?=$disabled?>></span>
 
+<?if ($hide_eth):?>
+</div>
+<?endif;?>
 <?endif;?>
 <?endforeach;?>
 <?if ($unset && $protocol[$network] != 'ipv4'):?>
@@ -424,7 +473,6 @@ _(IPv6 custom network on interface)_ <?=$network?> (_(optional)_):
 </div>
 <?else: /* DOCKER STARTED */?>
 
-
 _(Docker version)_:
 : <?$arrInfo = $DockerClient->getInfo(); echo $arrInfo['Version']?>
 
@@ -473,72 +521,117 @@ _(Preserve user defined networks)_:
 
 <?foreach ($include as $network => $route):?>
 <?
-$net = normalize($network);
+$net         = normalize($network);
 $docker_dhcp = "DOCKER_DHCP_$net";
+$hide_wlan   = hide_wlan($network);
 ?>
 <?if (isset($dockercfg[$docker_dhcp]) || empty($dockercfg["DOCKER_AUTO_$net"])):?>
+<?if ($hide_wlan):?>
+<div markdown="1" style="display:none">
+<?endif;?>
+
 _(IPv4 custom network on interface)_ <?=$network?>:
 : <span class="<?=$gw4class?>">**_(Subnet)_:** <?=$route?></span>
   <span class="<?=$gw4class?>">**_(Gateway)_:** <?=$gateway[$network]?></span>
   **_(DHCP pool)_:** <?=_var($dockercfg,$docker_dhcp) ?: "_(not set)_"?><?if (isset($dockercfg[$docker_dhcp])):?>&nbsp;&nbsp;(<?=pow(2,32-my_explode('/',$dockercfg[$docker_dhcp])[1])?> _(hosts)_)<?endif;?>
 
+<?if ($hide_wlan):?>
+</div>
+<?endif;?>
 <?endif;?>
 <?endforeach;?>
 <?foreach ($unset as $network):?>
 <?
-$port = normalize($network);
-[$eth,$vlan] = my_explode('.',$network);
-$eth = str_replace(['bond','br'],'eth',$eth);
-if (!$vlan) {
-  $protocol = _var($$eth,'PROTOCOL:0','ipv4');
-} else {
-  foreach ($$eth as $key => $value) {
-    if (strpos($key,'VLANID')!==false && $value==$vlan) {$protocol = _var($$eth,str_replace('VLANID','PROTOCOL',$key),'ipv4'); break;}
+$port     = normalize($network);
+$hide_eth = hide_eth($network);
+
+if (substr($network,0,4) != 'wlan') {
+  [$eth,$vlan] = my_explode('.',$network);
+  $eth = str_replace(['bond','br'],'eth',$eth);
+  if (!$vlan) {
+    $protocol = _var($$eth,'PROTOCOL:0','ipv4');
+  } else {
+    foreach ($$eth as $key => $value) {
+      if (strpos($key,'VLANID')!==false && $value==$vlan) {$protocol = _var($$eth,str_replace('VLANID','PROTOCOL',$key),'ipv4'); break;}
+    }
   }
+} else {
+  $protocol = empty($wlan['IP6']) ? 'ipv4' : 'ipv4+ipv6';
 }
+
 [$subnet,$mask] = my_explode('/',_var($dockercfg,"DOCKER_SUBNET_$port"));
 [$range,$size] = my_explode('/',_var($dockercfg,"DOCKER_RANGE_$port"));
 ?>
 <?if ($protocol != 'ipv6' && $subnet):?>
+<?if ($hide_eth):?>
+<div markdown="1" style="display:none">
+<?endif;?>
+
 _(IPv4 custom network on interface)_ <?=$network?>:
 : <span class="<?=$gw4class?>">**_(Subnet)_:** <?=$subnet?>/<?=$mask?></span>
   <span class="<?=$gw4class?>">**_(Gateway)_:** <?=_var($dockercfg,"DOCKER_GATEWAY_$port")?></span>
   **_(DHCP pool)_:** <?=$range ? "$range/$size" : "_(not set)_"?><?if ($range):?>&nbsp;&nbsp;(<?=pow(2,32-($size?:25))?> _(hosts)_)<?endif;?>
 
+<?if ($hide_eth):?>
+</div>
+<?endif;?>
 <?endif;?>
 <?endforeach;?>
 <?foreach ($include6 as $network => $route):?>
 <?
-$net = normalize($network);
+$net          = normalize($network);
 $docker_dhcp6 = "DOCKER_DHCP6_$net";
+$hide_wlan    = hide_wlan($network);
+
 if (isset($dockercfg[$docker_dhcp6]) || empty($dockercfg["DOCKER_AUTO_$net"])):?>
 <?$wide = true;?>
+<?if ($hide_wlan):?>
+<div markdown="1" style="display:none">
+<?endif;?>
+
 _(IPv6 custom network on interface)_ <?=$network?>:
 : <span class="gw6">**_(Subnet)_:** <?=$route?></span>
   <span class="gw6">**_(Gateway)_:** <?=$gateway6[$network]?></span>
 
+<?if ($hide_wlan):?>
+</div>
+<?endif;?>
 <?endif;?>
 <?endforeach;?>
 <?foreach ($unset as $network):?>
 <?
-$port = normalize($network);
-[$eth,$vlan] = my_explode('.',$network);
-$eth = str_replace(['bond','br'],'eth',$eth);
-if (!$vlan) {
-  $protocol = _var($$eth,'PROTOCOL:0','ipv4');
-} else {
-  foreach ($$eth as $key => $value) {
-    if (strpos($key,'VLANID')!==false && $value==$vlan) {$protocol = _var($$eth,str_replace('VLANID','PROTOCOL',$key),'ipv4'); break;}
+$port     = normalize($network);
+$hide_eth = hide_eth($network);
+
+if (substr($network,0,4) != 'wlan') {
+  [$eth,$vlan] = my_explode('.',$network);
+  $eth = str_replace(['bond','br'],'eth',$eth);
+  if (!$vlan) {
+    $protocol = _var($$eth,'PROTOCOL:0','ipv4');
+  } else {
+    foreach ($$eth as $key => $value) {
+      if (strpos($key,'VLANID')!==false && $value==$vlan) {$protocol = _var($$eth,str_replace('VLANID','PROTOCOL',$key),'ipv4'); break;}
+    }
   }
+} else {
+  $protocol = empty($wlan['IP6']) ? 'ipv4' : 'ipv4+ipv6';
 }
+
 [$subnet6,$mask6] = my_explode('/',_var($dockercfg,"DOCKER_SUBNET6_$port"));
 [$range6,$size6] = my_explode('/',_var($dockercfg,"DOCKER_RANGE6_$port"));
 ?>
 <?if ($protocol != 'ipv4' && $subnet6):?>
+<?if ($hide_eth):?>
+<div markdown="1" style="display:none">
+<?endif;?>
+
 _(IPv6 custom network on interface)_ <?=$network?>:
 : <span class="gw6">**_(Subnet)_:** <?=$subnet6?>/<?=$mask6?></span>
   <span class="gw6">**_(Gateway)_:** <?=_var($dockercfg,"DOCKER_GATEWAY6_$port")?></span>
 
+<?if ($hide_eth):?>
+</div>
+<?endif;?>
 <?endif;?>
 <?endforeach;?>
 </div>
@@ -910,7 +1003,7 @@ function updateLocation(val) {
   }
 }
 function updateBackingFS(val) {
-  var backingfs = "<?= _var($dockercfg,'DOCKER_BACKINGFS') ?>";
+  var backingfs = "<?=_var($dockercfg,'DOCKER_BACKINGFS')?>";
   var warning = document.getElementById("WARNING_BACKINGFS");
   var checkbox = $(".deleteCheckbox");
   if (val !== backingfs) {
diff --git a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
index 6f8d0a981a..ef636c2c58 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -1092,10 +1092,12 @@ function prepareCategory() {
     [$eth,$x] = my_explode('.',$network);
     $eth = str_replace(['br','bond'],'eth',$eth);
     $n = $x ? 1 : 0; while (isset($$eth["VLANID:$n"]) && $$eth["VLANID:$n"] != $x) $n++;
-    if ($$eth["DESCRIPTION:$n"]) $name .= ' -- '.compress(trim($$eth["DESCRIPTION:$n"]));
+    if (!empty($$eth["DESCRIPTION:$n"])) $name .= ' -- '.compress(trim($$eth["DESCRIPTION:$n"]));
   } elseif (preg_match('/^wg[0-9]+$/',$network)) {
     $conf = file("/etc/wireguard/$network.conf");
     if ($conf[1][0]=='#') $name .= ' -- '.compress(trim(substr($conf[1],1)));
+  } elseif (substr($network,0,4)=='wlan') {
+    $name .= '  -- '._('Wireless interface');
   }
   ?>
   <?=mk_option(1,$network,_('Custom')." : $name")?>
diff --git a/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php b/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
index 5375e1ff5e..cc979e715b 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
@@ -40,8 +40,11 @@
 
 // Docker configuration file - guaranteed to exist
 $docker_cfgfile = '/boot/config/docker.cfg';
+$mgmt_port = ['br0','bond0','eth0'];
+
 if (file_exists($docker_cfgfile)) {
-	$port = strtoupper(DockerUtil::port());
+	$port = DockerUtil::port();
+	$port = strtoupper((in_array($port,$mgmt_port) && lan_port($port,true)==0) ? 'wlan0' : $port);
 	exec("grep -Pom2 '_SUBNET_|_{$port}(_[0-9]+)?=' $docker_cfgfile",$cfg);
 	if (isset($cfg[0]) && $cfg[0]=='_SUBNET_' && empty($cfg[1])) {
 		# interface has changed, update configuration
@@ -49,7 +52,7 @@
 	}
 }
 
-$defaults = (array)@parse_ini_file("$docroot/plugins/dynamix.docker.manager/default.cfg");
+$defaults  = (array)@parse_ini_file("$docroot/plugins/dynamix.docker.manager/default.cfg");
 $dockercfg = array_replace_recursive($defaults, (array)@parse_ini_file($docker_cfgfile));
 
 function var_split($item, $i=0) {
@@ -1078,15 +1081,12 @@ public function getDockerImages() {
 ##################################
 
 class DockerUtil {
-	public static function ensureImageTag($image): string
-	{
+	public static function ensureImageTag($image): string {
 		extract(static::parseImageTag($image));
-
 		return "$strRepo:$strTag";
 	}
 
-	public static function parseImageTag($image): array
-	{
+	public static function parseImageTag($image): array {
 		if (strpos($image, 'sha256:') === 0) {
 			// sha256 was provided instead of actual repo name so truncate it for display:
 			$strRepo = substr($image, 7, 12);
@@ -1102,21 +1102,17 @@ public static function parseImageTag($image): array
 				$strRepo = $image;
 			}
 		}
-
 		// Add :latest tag to image if it's absent
 		if (empty($strTag)) $strTag = 'latest';
-
 		return array_map('trim', ['strRepo' => $strRepo, 'strTag' => $strTag]);
 	}
 
-	private static function splitImage($image): ?array
-	{
+	private static function splitImage($image): ?array {
 		if (false === preg_match('@^(.+/)*([^/:]+)(:[^:/]*)*$@', $image, $newSections) || count($newSections) < 3) {
 			return null;
 		} else {
 			[, $strRepo, $image, $strTag] = array_merge($newSections, ['']);
 			$strTag = str_replace(':','',$strTag??'');
-
 			return [
 				'strRepo' => $strRepo . $image,
 				'strTag' => $strTag,
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 024b0f21e4..c3974014d9 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -1484,9 +1484,7 @@
 					<select name="nic[<?=$i?>][network]">
 					<?
 					foreach (array_keys($arrValidNetworks) as $key) {
-
 						echo mk_option("", $key, "- "._($key)." -", "disabled");
-
 						foreach ($arrValidNetworks[$key] as $strNetwork) {
 							echo mk_option($arrNic['network'], $strNetwork, $strNetwork);
 						}
diff --git a/etc/rc.d/rc.docker b/etc/rc.d/rc.docker
index aed81b96d4..b8ca89a8e1 100755
--- a/etc/rc.d/rc.docker
+++ b/etc/rc.d/rc.docker
@@ -16,9 +16,9 @@ DAEMON="Docker daemon"
 UNSHARE="/usr/bin/unshare"
 SYSTEM="/sys/class/net"
 CONF6="/proc/sys/net/ipv6/conf"
-STOCK="bond br eth"
+STOCK="bond br eth wlan"
 ACTIVE=$(ls --indicator-style=none $SYSTEM | awk "/^(${STOCK// /|})[0-9]/" ORS=' ')
-NICS=$(ls --indicator-style=none $SYSTEM | awk '/^eth[0-9]+$/')
+NICS=$(ls --indicator-style=none $SYSTEM | awk '/^(eth|wlan)[0-9]+$/')
 
 DOCKERD="dockerd"
 DOCKER="/usr/bin/$DOCKERD"
@@ -38,20 +38,23 @@ TMP=/var/tmp/network.tmp
 # determine active port name
 [[ -e $SYSTEM/bond0 ]] && PORT=bond0 || PORT=eth0
 [[ -e $SYSTEM/br0 ]] && PORT=br0
+[[ $(cat $SYSTEM/$PORT/carrier) == 0 && -e $SYSTEM/wlan0 && $(cat $SYSTEM/wlan0/carrier) == 1 ]] && PORT=wlan0
 
 # Set defaults used by the docker daemon
 if [[ -f $DOCKER_CFG ]]; then
   for NIC in $NICS; do
-    if [[ -e $SYSTEM/${NIC/eth/br} ]]; then
-      NIC=${NIC/eth/br}
-    elif [[ -e $SYSTEM/${NIC/eth/bond} ]]; then
-      NIC=${NIC/eth/bond}
+    if [[ ${NIC:0:3} == eth ]]; then
+      if [[ -e $SYSTEM/${NIC/eth/br} ]]; then
+        NIC=${NIC/eth/br}
+      elif [[ -e $SYSTEM/${NIC/eth/bond} ]]; then
+        NIC=${NIC/eth/bond}
+      fi
     fi
     CFG=($(grep -Pom2 "_SUBNET_|_${NIC^^}(_[0-9]+)?=" $DOCKER_CFG))
     if [[ ${CFG[0]} == _SUBNET_ && -z ${CFG[1]} ]]; then
       # interface has changed, update configuration
       X=${NIC//[^0-9]/}
-      sed -ri "s/_(BR|BOND|ETH)$X(_[0-9]+)?=/_${NIC^^}\2=/; s/(br|bond|eth)$X(\.[0-9]+)? /$NIC\2 /g" $DOCKER_CFG
+      sed -ri "s/_(BR|BOND|ETH|WLAN)$X(_[0-9]+)?=/_${NIC^^}\2=/; s/(br|bond|eth|wlan)$X(\.[0-9]+)? /$NIC\2 /g" $DOCKER_CFG
     fi
   done
   # Read (updated) Unraid docker configuration file
@@ -195,11 +198,11 @@ container_add_route(){
   local PID=${CT[0]}
   local NET=${CT[1]#*[}
   local LAN=${NET%:*}
-  if [[ $PID -gt 0 && "eth0 br0 bond0" =~ $LAN ]]; then
-    local THISIP=$(sed -n '/^\[eth0\]$/,/^TYPE/p' $INI | grep -Pom1 '^IPADDR:0="\K[^"]+')
+  if [[ $PID -gt 0 && "eth0 br0 bond0 wlan0" =~ $LAN ]]; then
+    local THISIP=$(ip -4 -br addr show dev $LAN scope global | awk '{print $3;exit}')
     for CFG in /etc/wireguard/wg*.cfg ; do
-      local NETWORK=$(grep -Pom1 '^Network:0="\K[^"]+' $CFG)
-      [[ -n $NETWORK ]] && nsenter -n -t $PID ip -4 route add $NETWORK via $THISIP dev $LAN 2>/dev/null
+      local NETWORK=$(ip -4 show route dev $LAN $THISIP | awk '{print $1;exit}')
+      [[ -n $NETWORK ]] && nsenter -n -t $PID ip -4 route add $NETWORK via ${THISIP%/*} dev $LAN 2>/dev/null
     done
   fi
 }
@@ -216,14 +219,16 @@ docker_network_start(){
         INCLUDE="${INCLUDE}${NETWORK} "
         EXCLUDE="${EXCLUDE}${NETWORK/bond/eth} "
       fi
-    else
+    elif [[ ${NETWORK:0:3} == eth ]]; then
       if [[ $INCLUDE =~ "${NETWORK/eth/br} " || $INCLUDE =~ "${NETWORK/eth/bond} " ]]; then
         [[ $EXCLUDE =~ "$NETWORK " ]] || EXCLUDE="${EXCLUDE}${NETWORK} "
       else
         INCLUDE="${INCLUDE}${NETWORK} "
       fi
+    else
+      INCLUDE="${INCLUDE}${NETWORK} "
     fi
-  done <<< $(ls --indicator-style=none $SYSTEM | grep -P '^(bond|eth)[0-9]+')
+  done <<< $(ls --indicator-style=none $SYSTEM | grep -P '^(bond|eth|wlan)[0-9]+')
   if ! docker_running; then return 1; fi
   # get container settings for custom networks to reconnect later
   declare -A NETRESTORE CTRESTORE
@@ -233,17 +238,23 @@ docker_network_start(){
     XMLFILE=$(find /boot/config/plugins/dockerMan/templates-user -maxdepth 1 -iname my-${CONTAINER}.xml)
     if [[ -n $XMLFILE ]]; then
       REBUILD=
+      MAIN=
       # update custom network reference (if changed)
       for NIC in $NICS; do
-        if [[ -e $SYSTEM/${NIC/eth/br} ]]; then
-          NIC=${NIC/eth/br}
-        elif [[ -e $SYSTEM/${NIC/eth/bond} ]]; then
-          NIC=${NIC/eth/bond}
+        if [[ ${NIC:0:3} == eth ]]; then
+          if [[ -e $SYSTEM/${NIC/eth/br} ]]; then
+            NIC=${NIC/eth/br}
+          elif [[ -e $SYSTEM/${NIC/eth/bond} ]]; then
+            NIC=${NIC/eth/bond}
+          fi
         fi
         X=${NIC//[^0-9]/}
-        REF=$(grep -Pom1 "<Network>\K(br|bond|eth)$X" $XMLFILE)
+        REF=$(grep -Pom1 "<Network>\K(br|bond|eth|wlan)$X" $XMLFILE)
+        [[ $X == 0 && $(cat $SYSTEM/$NIC/carrier) == 0 ]] && continue
+        [[ $X == 0 && $NIC != wlan0 ]] && MAIN=$NIC
+        [[ $NIC == wlan0 && -n $MAIN ]] && continue
         if [[ -n $REF && $REF != $NIC ]]; then
-          sed -ri "s/<Network>(br|bond|eth)$X(\.[0-9]+)?<\/Network>/<Network>$NIC\2<\/Network>/" $XMLFILE
+          sed -ri "s/<Network>(br|bond|eth|wlan)$X(\.[0-9]+)?<\/Network>/<Network>$NIC\2<\/Network>/" $XMLFILE
           # flag container for later rebuild
           REBUILD=1
         fi
@@ -282,10 +293,12 @@ docker_network_start(){
   done
   # detach custom networks
   for NIC in $NICS; do
-    if [[ -e $SYSTEM/${NIC/eth/br} ]]; then
-      NIC=${NIC/eth/br}
-    elif [[ -e $SYSTEM/${NIC/eth/bond} ]]; then
-      NIC=${NIC/eth/bond}
+    if [[ ${NIC:0:3} == eth ]]; then
+      if [[ -e $SYSTEM/${NIC/eth/br} ]]; then
+        NIC=${NIC/eth/br}
+      elif [[ -e $SYSTEM/${NIC/eth/bond} ]]; then
+        NIC=${NIC/eth/bond}
+      fi
     fi
     X=${NIC//[^0-9]/}
     driver ${NIC//[0-9]/}
@@ -393,7 +406,14 @@ docker_network_start(){
     if [[ -n $SUBNET || -n $SUBNET6 ]]; then
       TYPE=${NETWORK//[0-9.]/}
       driver $TYPE
-      [[ $TYPE == br ]] && VHOST=$NETWORK || VHOST=vhost${NETWORK//[^0-9.]/}
+      if [[ $TYPE == br ]]; then
+        VHOST=$NETWORK
+      elif [[ $TYPE == wlan ]]; then
+        VHOST=shim-$NETWORK
+        ATTACH=ipvlan
+      else
+        VHOST=vhost${NETWORK//[^0-9.]/}
+      fi
       docker network create -d $ATTACH $SUBNET $GATEWAY $SERVER $RANGE $SUBNET6 $GATEWAY6 $SERVER6 -o parent=$VHOST $NETWORK | xargs docker network inspect -f "created network $ATTACH {{.Name}} with subnets: {{range .IPAM.Config}}{{.Subnet}}; {{end}}" 2>/dev/null | log
       # connect containers to this new network
       for CONNECT in ${NETRESTORE[$NETWORK]}; do
@@ -417,7 +437,7 @@ docker_network_start(){
         GW=($(ip -4 route show default dev $NETWORK | awk '{print $3,$5;exit}'))
         if [[ $DOCKER_ALLOW_ACCESS == yes && -n $IPV4 ]]; then
           # create shim interface and copy parent IPv4 address to shim interface
-          [[ -e $SYSTEM/$LINK ]] || run ip link add $LINK link $NETWORK type $ATTACH mode $MODE
+          [[ -e $SYSTEM/$LINK ]] || run ip link add link $NETWORK name $LINK type $ATTACH mode $MODE
           run ip addr flush dev $LINK
           run ip -4 addr add $IPV4 dev $LINK metric 0
           # disable IPv6 on shim interface
@@ -442,7 +462,7 @@ docker_network_start(){
           run ip link set $LINK down
           run ip link del $LINK
         fi
-      else
+      elif [[ $TYPE != wlan ]]; then
         if [[ $DOCKER_ALLOW_ACCESS == yes && -n $IPV4 ]]; then
           run ip addr flush dev $VHOST
           # copy IPv4 address to vhost interface
@@ -467,10 +487,12 @@ docker_network_stop(){
   log "Stopping network..."
   if ! docker_running; then return 1; fi
   for NIC in $NICS; do
-    if [[ -e $SYSTEM/${NIC/eth/br} ]]; then
-      NIC=${NIC/eth/br}
-    elif [[ -e $SYSTEM/${NIC/eth/bond} ]]; then
-      NIC=${NIC/eth/bond}
+    if [[ ${NIC:0:3} == eth ]]; then
+      if [[ -e $SYSTEM/${NIC/eth/br} ]]; then
+        NIC=${NIC/eth/br}
+      elif [[ -e $SYSTEM/${NIC/eth/bond} ]]; then
+        NIC=${NIC/eth/bond}
+      fi
     fi
     driver ${NIC//[0-9]/}
     for NETWORK in $(network $ATTACH ${NIC//[^0-9]/}); do
@@ -485,6 +507,8 @@ docker_network_stop(){
           run ip link set $LINK down
           run ip link del $LINK
         fi
+      elif [[ $TYPE == wlan ]]; then
+        [[ -e $SYSTEM/$NETWORK ]] && run ip addr flush dev $NETWORK
       else
         VHOST=vhost${NETWORK//[^0-9.]/}
         [[ -e $SYSTEM/$VHOST ]] && run ip addr flush dev $VHOST
diff --git a/etc/rc.d/rc.wireless b/etc/rc.d/rc.wireless
index 1b9a35040a..f286213f84 100755
--- a/etc/rc.d/rc.wireless
+++ b/etc/rc.d/rc.wireless
@@ -179,7 +179,10 @@ wifi_start(){
   log "Starting $DAEMON..."
   local REPLY
   if [[ -e $SYSTEM/$PORT ]]; then
+    LINK=shim-$PORT
+    [[ -e $SYSTEM/$LINK ]] || run ip link add link $PORT name $LINK type ipvlan mode l2 bridge
     run ip link set $PORT up
+    run ip link set $LINK up
     ssl_init
     # start active SSID
     $STARTWIFI
@@ -211,9 +214,9 @@ wifi_stop(){
       DNS=$DNS6
       ipaddr_down
     fi
-    pkill wpa_supplicant
-    iw dev $PORT disconnect 2>/dev/null
-    rm -f $INI
+    run pkill wpa_supplicant
+    run iw dev $PORT disconnect
+    run rm -f $INI
     if ! wifi_running; then REPLY="Stopped"; else REPLY="Failed"; fi
   else
     REPLY="No Wifi present"
@@ -236,15 +239,15 @@ wifi_join(){
   SECURITY=${SECURITY:-$ATTR3}
   if [[ -z $SECURITY || ${SECURITY^^} == "OPEN" ]]; then
     # open network
-    iw dev $PORT connect "$SSID" auth open 2>/dev/null
+    run iw dev $PORT connect "$SSID" auth open
   elif [[ $SECURITY =~ "WEP" ]]; then
     # WEP encryption
-    iw dev $PORT connect "$SSID" auth shared key 0:$(hex "$PASSWORD") 2>/dev/null
+    run iw dev $PORT connect "$SSID" auth shared key 0:$(hex "$PASSWORD")
   else
     # WPA encryption
-    wpa_configuration "$SECURITY"
+    run wpa_configuration "$SECURITY"
     [[ -n $(pgrep wpa_supplicant) ]] && pkill wpa_supplicant
-    wpa_supplicant -B -i $PORT -c $WPA 2>/dev/null
+    run wpa_supplicant -B -i $PORT -c $WPA
   fi
   # IPv4 address assignment
   IP=ipv4