diff --git a/roles/network/templates/hostapd/iiab-hotspot-off b/roles/network/templates/hostapd/iiab-hotspot-off
index eb5951c6b..98fb9dbf2 100755
--- a/roles/network/templates/hostapd/iiab-hotspot-off
+++ b/roles/network/templates/hostapd/iiab-hotspot-off
@@ -38,6 +38,8 @@ fi
 echo -e "\nPlease reboot to enable upstream WiFi access.\n"
 exit 0
 {% endif %}
+#is_raspbian
+{% endif %}
 #wifi_up_down
 {% endif %}
-{% endif %}
+#network_enabled
diff --git a/roles/network/templates/hostapd/iiab-hotspot-on b/roles/network/templates/hostapd/iiab-hotspot-on
index 04d551774..3f809bf44 100755
--- a/roles/network/templates/hostapd/iiab-hotspot-on
+++ b/roles/network/templates/hostapd/iiab-hotspot-on
@@ -46,7 +46,10 @@ systemctl enable hostapd
 echo -e "\nPlease reboot to activate hostapd feature.\n"
 exit 0
 {% endif %}
+#is_raspbian
+{% endif %}
 #wifi_up_down
 {% endif %}
+#can_be_ap
 {% endif %}
-{% endif %}
+#network_enabled