diff --git a/roles/network/tasks/NM-debian.yml b/roles/network/tasks/NM-debian.yml
index 565a5d42e..7b3a356f5 100644
--- a/roles/network/tasks/NM-debian.yml
+++ b/roles/network/tasks/NM-debian.yml
@@ -3,26 +3,39 @@
   include_tasks: down-debian.yml
 
 # provide keyfile layout like the XO's used way back.
-- name: Create uuid for NM's keyfile store
-  shell: uuidgen
-  register: uuid_response
+#- name: Create uuid for NM's keyfile store
+#  shell: uuidgen
+#  register: uuid_response
 
-- name: Put the uuid in place
-  set_fact:
-    gen_uuid: "{{ uuid_response.stdout_lines[0] }}"
+#- name: Put the uuid in place
+#  set_fact:
+#    gen_uuid: "{{ uuid_response.stdout_lines[0] }}"
 
-- name: Copy manage.conf for NetworkManager
+# systemd-networkd handles br0 except for Raspbian
+- name: Remove stale br0 for NetworkManager
+  file:
+    dest: /etc/NetworkManager/system-connections/bridge-br0
+    state: absent
+
+- name: Copy ap0-manage.conf for NetworkManager
+  template:
+    dest: /etc/NetworkManager/conf.d/ap0-manage.conf
+    src: network/ap0-manage.conf
+    mode: 0644
+  when: wifi_up_down
+
+- name: Copy manage.conf for NetworkManager when wifi_up_down False
   template:
     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
+- name: Remove manage.conf for NetworkManager when wifi_up_down True
   file:
-    dest: /etc/NetworkManager/system-connections/bridge-br0
+    dest: /etc/NetworkManager/conf.d/wifi-manage.conf
     state: absent
-#  when: iiab_network_mode == "Appliance"
+  when: wifi_up_down
 
 - name: Removing static for NetworkManager
   file:
diff --git a/roles/network/templates/network/ap0-manage.conf b/roles/network/templates/network/ap0-manage.conf
new file mode 100644
index 000000000..400832df1
--- /dev/null
+++ b/roles/network/templates/network/ap0-manage.conf
@@ -0,0 +1,3 @@
+# IIAB WiFi
+[keyfile]
+unmanaged-devices=interface-name:ap0