diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml
index 3df31bacd..c3f5855c5 100644
--- a/roles/network/tasks/detected_network.yml
+++ b/roles/network/tasks/detected_network.yml
@@ -28,6 +28,11 @@
     systemd_networkd_active: True
   when: 'ansible_local.local_facts.systemd_networkd == "enabled"'
 
+- name: Setting systemd_networkd-2 results
+  set_fact:
+    systemd_networkd_active: True
+  when: 'ansible_local.local_facts.systemd_networkd == "enabled-runtime"'
+
 - name: Setting network_manager results
   set_fact:
     network_manager_active: True
diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml
index ae5c17f34..804e314d7 100644
--- a/roles/network/tasks/sysd-netd-debian.yml
+++ b/roles/network/tasks/sysd-netd-debian.yml
@@ -38,13 +38,18 @@
     wan_cidr: "{{ CIDR.stdout }}"
   when: wan_ip != "dhcp"
 
+- name: Figure out netplan file name on Ubuntu 18
+  shell: ls /etc/netplan
+  register: netplan
+  when: is_ubuntu_18
+
 # ICO will always set gui_static_wan_ip away from the default of 'unset' while
 # gui_static_wan turns dhcp on/off through wan_ip in computed_network and
 # overrides gui_static_wan_ip that is present. Changing wan_ip in local_vars
 # is a oneway street to static.
 - name: Supply static template
   template:
-    dest:  /etc/netplan/50-cloud-init.yaml
+    dest:  /etc/netplan/{{ netplan.stdout }}
     src: network/cloud-init.j2
     backup: no
   when: (wan_ip != "dhcp" or gui_static_wan_ip == "undefined") and is_ubuntu_18