diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml
index 2bcfd86bbf..c10b015fb0 100644
--- a/roles/network/tasks/sysd-netd-debian.yml
+++ b/roles/network/tasks/sysd-netd-debian.yml
@@ -36,11 +36,12 @@
     wan_cidr: "{{ CIDR.stdout }}"
   when: wan_ip != "dhcp"
 
-- name: Supply static WAN template (ubuntu-16)
+- name: Supply static WAN template when network_manager_active is False
   template:
     dest: /etc/systemd/network/IIAB-Static.network
     src: network/systemd-static-net.j2
-  when: wan_ip != "dhcp" and is_ubuntu_16
+  when: wan_ip != "dhcp" and ( is_ubuntu_16 or not network_manager_active )
+
   #when: wan_ip != "dhcp" and not is_ubuntu_18
 
 - name: Stopping services
@@ -54,6 +55,7 @@
   systemd:
     name: systemd-networkd
     enabled: yes
+    masked: no
     state: restarted
   #when: (netplan.stdout is undefined or netplan.stdout.find("yaml") == -1) and not no_net_restart
   when: not no_net_restart