diff --git a/roles/network/tasks/hostapd.yml b/roles/network/tasks/hostapd.yml
index 07e534b66..3b9231a86 100644
--- a/roles/network/tasks/hostapd.yml
+++ b/roles/network/tasks/hostapd.yml
@@ -50,21 +50,8 @@
     mode: 0644
   when: not wifi_up_down and can_be_ap
 
-- name: Create /usr/bin/iiab-hotspot-on from template
-  template:
-    src: hostapd/iiab-hotspot-on
-    dest: /usr/bin/iiab-hotspot-on
-    owner: root
-    group: root
-    mode: 0755
-
-- name: Create /usr/bin/iiab-hotspot-off from template
-  template:
-    src: hostapd/iiab-hotspot-off
-    dest: /usr/bin/iiab-hotspot-off
-    owner: root
-    group: root
-    mode: 0755
+# 2022-07-11: Install of iiab-hotspot-on|off moved to network/tasks/main.yml
+# as required for Admin Console
 
 - name: Create dhcpcd hook for hostapd and ap0 when wifi_up_down True
   template:
diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index 86a07413b..567a21159 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -25,6 +25,22 @@
   include_tasks: install.yml
   when: network_install and network_installed is undefined
 
+- name: Create /usr/bin/iiab-hotspot-on from template
+  template:
+    src: hostapd/iiab-hotspot-on
+    dest: /usr/bin/iiab-hotspot-on
+    owner: root
+    group: root
+    mode: 0755
+
+- name: Create /usr/bin/iiab-hotspot-off from template
+  template:
+    src: hostapd/iiab-hotspot-off
+    dest: /usr/bin/iiab-hotspot-off
+    owner: root
+    group: root
+    mode: 0755
+
 - name: Configuring Network if enabled
   block:
   # - name: Configure wondershaper