diff --git a/roles/network/tasks/netplan.yml b/roles/network/tasks/netplan.yml
index 41d017180..0eb96166b 100644
--- a/roles/network/tasks/netplan.yml
+++ b/roles/network/tasks/netplan.yml
@@ -23,6 +23,13 @@
     - systemd-networkd-wait-online
   when: systemd_networkd_active | bool
 
+- name: Unmask and enable the systemd-networkd service for br0
+  systemd:
+    name: systemd-networkd
+    enabled: yes
+    masked: no
+  when: network_manager_active | bool and iiab_lan_iface == "br0"
+
 - name: Ensure systemd-networkd gets enabled for br0
   set_fact:
     systemd_networkd_active: True
diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml
index c153f2116..a1a904cfa 100644
--- a/roles/network/tasks/sysd-netd-debian.yml
+++ b/roles/network/tasks/sysd-netd-debian.yml
@@ -1,10 +1,4 @@
 # sysd-netd-debian.yml
-- name: Unmask and enable the systemd-networkd service
-  systemd:
-    name: systemd-networkd
-    enabled: yes
-    masked: no
-
 - name: Copy the bridge script - Creates br0
   template:
     dest: /etc/systemd/network/IIAB-Bridge.netdev