diff --git a/debian/changelog b/debian/changelog
index 817e0429..5e28411e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.525.1) UNRELEASED; urgency=medium
+
+  * Symlink systemd-networkd-wait-online to /bin/true in the live installer
+    live session to avoid depending on buggy systemd behaviour.
+  * Remove "optional: true" from installer netplan config.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Wed, 23 May 2018 14:27:01 +1200
+
 livecd-rootfs (2.525) bionic; urgency=medium
 
   * Don't fail to build CPC images if /lib/modules already exists in the
diff --git a/live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml b/live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml
index bfa19a26..b8399cb6 100644
--- a/live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml
+++ b/live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml
@@ -7,9 +7,7 @@ network:
             match:
                 name: "en*"
             dhcp4: true
-            optional: true
         all-eth:
             match:
                 name: "eth*"
             dhcp4: true
-            optional: true
diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/systemd-networkd-wait-online b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/systemd-networkd-wait-online
new file mode 120000
index 00000000..63b10de4
--- /dev/null
+++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/systemd-networkd-wait-online
@@ -0,0 +1 @@
+/bin/true
\ No newline at end of file