diff --git a/roles/network/tasks/hostapd.yml b/roles/network/tasks/hostapd.yml
index fdf6438d9..07e534b66 100644
--- a/roles/network/tasks/hostapd.yml
+++ b/roles/network/tasks/hostapd.yml
@@ -52,7 +52,7 @@
 
 - name: Create /usr/bin/iiab-hotspot-on from template
   template:
-    src: network/iiab-hotspot-on
+    src: hostapd/iiab-hotspot-on
     dest: /usr/bin/iiab-hotspot-on
     owner: root
     group: root
@@ -60,7 +60,7 @@
 
 - name: Create /usr/bin/iiab-hotspot-off from template
   template:
-    src: network/iiab-hotspot-off
+    src: hostapd/iiab-hotspot-off
     dest: /usr/bin/iiab-hotspot-off
     owner: root
     group: root
diff --git a/roles/network/templates/network/iiab-hotspot-off b/roles/network/templates/hostapd/iiab-hotspot-off
similarity index 100%
rename from roles/network/templates/network/iiab-hotspot-off
rename to roles/network/templates/hostapd/iiab-hotspot-off
diff --git a/roles/network/templates/network/iiab-hotspot-on b/roles/network/templates/hostapd/iiab-hotspot-on
similarity index 91%
rename from roles/network/templates/network/iiab-hotspot-on
rename to roles/network/templates/hostapd/iiab-hotspot-on
index d92cb5f21..055915fef 100755
--- a/roles/network/templates/network/iiab-hotspot-on
+++ b/roles/network/templates/hostapd/iiab-hotspot-on
@@ -1,4 +1,7 @@
 #!/bin/bash
+{% if not can_be_ap %}
+AP support was not detected please see https://github.com/iiab/iiab/pull/3179
+{% else %}
 sed -i -e "s/^HOSTAPD_ENABLED.*/HOSTAPD_ENABLED=True/" {{ iiab_env_file }}
 {% if wifi_up_down %}
 systemctl enable iiab-clone-wifi.service
@@ -38,3 +41,4 @@ exit 0
 {% endif %}
 #wifi_up_down
 {% endif %}
+{% endif %}