diff --git a/roles/network/tasks/computed_network.yml b/roles/network/tasks/computed_network.yml
index ee418a81c..62d64bd25 100644
--- a/roles/network/tasks/computed_network.yml
+++ b/roles/network/tasks/computed_network.yml
@@ -130,7 +130,18 @@
 - name: LAN configured - 'Gateway' mode
   set_fact:
     iiab_network_mode: "Gateway"
-  when: iiab_lan_iface != "none" and iiab_wan_iface != "none"
+  when: (iiab_lan_iface != "none" and iiab_wan_iface != "none") or is_rpi
+
+- name: Force iiab_lan_iface if is_rpi
+  set_fact:
+    iiab_lan_iface: "br0"
+    iiab_wireless_lan_iface: "wlan0"
+  when: is_rpi
+
+- name: Enable hostapd if discovered_wireless_iface is not WAN
+  set_fact:
+    hostapd_enabled: True
+  when: is_rpi and iiab_wan_iface != discovered_wireless_iface
 
 # override with user_lan_iface setting if no longer in auto
 - name: Setting user LAN fact