diff --git a/machine.go b/machine.go
index 52ce459..ea7f141 100644
--- a/machine.go
+++ b/machine.go
@@ -301,9 +301,6 @@ Type=ether
 
 [Network]
 DHCP=ipv4
-# Disable link-local address to speedup boot
-LinkLocalAddressing=no
-IPv6AcceptRA=no
 `
 
 const networkdLinkTemplate = `
@@ -340,8 +337,8 @@ Description=fakemachine runner
 Conflicts=shutdown.target
 Before=shutdown.target
 Requires=basic.target
-Wants=systemd-resolved.service binfmt-support.service systemd-networkd.service
-After=basic.target systemd-resolved.service binfmt-support.service systemd-networkd.service
+Wants=systemd-resolved.service binfmt-support.service network-online.target
+After=basic.target systemd-resolved.service binfmt-support.service network-online.target
 OnFailure=poweroff.target
 
 [Service]