diff --git a/roles/network/tasks/hostapd.yml b/roles/network/tasks/hostapd.yml
index 8e12593c7..2905e6159 100644
--- a/roles/network/tasks/hostapd.yml
+++ b/roles/network/tasks/hostapd.yml
@@ -1,4 +1,4 @@
-- name: Turn off hostapd when not using ap0 and wifi gateway present
+- name: Disable hostapd when not using ap0 and wifi gateway present
   set_fact:
     hostapd_enabled: False
   when: not wifi_up_down and discovered_wireless_iface == iiab_wan_iface
@@ -8,10 +8,10 @@
   register: current_host_channel
   when: discovered_wireless_iface != "none"
 
-- name: Setting WiFi channel to {{ current_host_channel.stdout }} on RPi hardware
+- name: Setting WiFi channel to {{ current_host_channel.stdout }}
   set_fact:
     host_channel: "{{ current_host_channel.stdout }}"
-  when: current_host_channel.stdout is defined and current_host_channel.stdout != "" and current_host_channel.stdout|int <= 13 and discovered_wireless_iface != "none" and rpi_model != "none"
+  when: current_host_channel.stdout is defined and current_host_channel.stdout != "" and current_host_channel.stdout|int <= 13
 
 - name: Create /etc/hostapd/hostapd.conf from template
   template:
@@ -104,7 +104,7 @@
     - { src: 'hostapd/00-iiab-debug', dest: '/etc/networkd-dispatcher/routable.d/00-iiab-debug' }
   when: systemd_networkd_active and discovered_wireless_iface != "none"
 
-- name: Create networkd-dispatcher hook for hostapd on RPi hardware
+- name: Create networkd-dispatcher hook for hostapd
   template:
     owner: root
     group: root
@@ -115,7 +115,7 @@
     - { src: 'hostapd/netd-disp', dest: '/etc/networkd-dispatcher/carrier.d/iiab-wifi' }
     - { src: 'hostapd/netd-disp', dest: '/etc/networkd-dispatcher/no-carrier.d/iiab-wifi' }
     - { src: 'hostapd/netd-disp', dest: '/etc/networkd-dispatcher/routable.d/iiab-wifi' }
-  when: systemd_networkd_active and discovered_wireless_iface != "none" and rpi_model != "none" and wifi_up_down
+  when: systemd_networkd_active and discovered_wireless_iface != "none" and wifi_up_down
 
 - name: Remove networkd-dispatcher hook for hostapd on RPi hardware and not up/down
   file: