diff --git a/roles/network/tasks/NM-debian.yml b/roles/network/tasks/NM-debian.yml
index 625741e09..565a5d42e 100644
--- a/roles/network/tasks/NM-debian.yml
+++ b/roles/network/tasks/NM-debian.yml
@@ -11,19 +11,18 @@
   set_fact:
     gen_uuid: "{{ uuid_response.stdout_lines[0] }}"
 
-# NM might have a watcher on this path and we don't have to restart NM
-- name: Copy the bridge script for NetworkManager
+- name: Copy manage.conf for NetworkManager
   template:
-    dest: /etc/NetworkManager/system-connections/
-    src: network/bridge-br0
-    mode: 0600
-  when: iiab_network_mode != "Appliance"
+    dest: /etc/NetworkManager/conf.d/wifi-manage.conf
+    src: network/manage.conf.j2
+    mode: 0644
+  when: discovered_wireless_iface != "none" and not wifi_up_down
 
 - name: Remove br0 in Appliance Mode for NetworkManager
   file:
     dest: /etc/NetworkManager/system-connections/bridge-br0
     state: absent
-  when: iiab_network_mode == "Appliance"
+#  when: iiab_network_mode == "Appliance"
 
 - name: Removing static for NetworkManager
   file:
diff --git a/roles/network/templates/network/manage.conf.j2 b/roles/network/templates/network/manage.conf.j2
new file mode 100644
index 000000000..fb5c25f55
--- /dev/null
+++ b/roles/network/templates/network/manage.conf.j2
@@ -0,0 +1,4 @@
+# IIAB WiFi
+[device]
+match-device=interface-name:{{ discovered_wireless_iface }}
+managed=0