diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml
index e2dc13e32..05c329dbe 100644
--- a/roles/network/tasks/detected_network.yml
+++ b/roles/network/tasks/detected_network.yml
@@ -145,10 +145,16 @@
   with_items:
     - "{{ lan_list_result.stdout_lines }}"
 
-- name: Set iiab_wireless_lan_iface if present
+
+- name: Set iiab_wireless_lan_iface to {{ discovered_wireless_iface }} if not none
   set_fact:
     iiab_wireless_lan_iface: "{{ discovered_wireless_iface }}"
-  when: discovered_wireless_iface is defined and discovered_wireless_iface != "none" and discovered_wireless_iface != iiab_wan_iface
+  when: discovered_wireless_iface != "none" and discovered_wireless_iface != iiab_wan_iface
+
+- name: Set iiab_wireless_lan_iface to ap0 if WiFi device is present
+  set_fact:
+    iiab_wireless_lan_iface: ap0
+  when: discovered_wireless_iface != "none" and wifi_up_down
 
 - name: Set iiab_wired_lan_iface if present
   set_fact:
diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml
index cf4d9ee4e..459400326 100644
--- a/roles/network/tasks/restart.yml
+++ b/roles/network/tasks/restart.yml
@@ -64,7 +64,7 @@
   command: /usr/bin/iiab-gen-iptables
 
 - name: Checking if WiFi slave is active
-  shell: brctl show br0 | grep ap0 | wc -l
+  shell: brctl show br0 | grep {{ iiab_wireless_lan_iface }} | wc -l
   when: hostapd_enabled and iiab_wireless_lan_iface is defined and iiab_lan_iface == "br0"
   register: wifi_slave
 
diff --git a/roles/network/templates/hostapd/hostapd.conf.j2 b/roles/network/templates/hostapd/hostapd.conf.j2
index 097a8d41a..28c558e14 100644
--- a/roles/network/templates/hostapd/hostapd.conf.j2
+++ b/roles/network/templates/hostapd/hostapd.conf.j2
@@ -1,6 +1,6 @@
 # Basic configuration
 
-interface=ap0
+interface={{ iiab_wireless_lan_iface }}
 
 ssid={{ host_ssid }}
 channel={{ host_channel }}
diff --git a/roles/network/templates/network/dhcpcd.conf.j2 b/roles/network/templates/network/dhcpcd.conf.j2
index 88c88201a..bc8f47ebd 100644
--- a/roles/network/templates/network/dhcpcd.conf.j2
+++ b/roles/network/templates/network/dhcpcd.conf.j2
@@ -38,7 +38,7 @@ require dhcp_server_identifier
 slaac private
 
 # IIAB
-denyinterfaces ap0
+denyinterfaces {{ iiab_wireless_lan_iface }}
 
 # Setting iiab_wired_lan_iface would install the device as a slave under
 # br0 so we need to turn off the dhcp client in that network layout.