diff --git a/live/EFI/fedora/grub.cfg b/live/EFI/fedora/grub.cfg
index 1171640796..1f81559709 100644
--- a/live/EFI/fedora/grub.cfg
+++ b/live/EFI/fedora/grub.cfg
@@ -28,6 +28,6 @@ set timeout=5
 
 ### BEGIN /etc/grub.d/10_linux ###
 menuentry 'Fedora CoreOS (Live)' --class fedora --class gnu-linux --class gnu --class os {
-	linux /images/vmlinuz @@KERNEL-ARGS@@ rd.neednet=1 ip=dhcp ignition.firstboot ignition.platform.id=metal
+	linux /images/vmlinuz @@KERNEL-ARGS@@ ignition.firstboot ignition.platform.id=metal
 	initrd /images/initramfs.img
 }
diff --git a/live/isolinux/isolinux.cfg b/live/isolinux/isolinux.cfg
index 4c1a5a8afe..c66370b7ee 100644
--- a/live/isolinux/isolinux.cfg
+++ b/live/isolinux/isolinux.cfg
@@ -67,7 +67,7 @@ label linux
   menu label ^Fedora CoreOS (Live)
   menu default
   kernel /images/vmlinuz
-  append initrd=/images/initramfs.img @@KERNEL-ARGS@@ rd.neednet=1 ip=dhcp ignition.firstboot ignition.platform.id=metal
+  append initrd=/images/initramfs.img @@KERNEL-ARGS@@ ignition.firstboot ignition.platform.id=metal
 
 menu separator # insert an empty line
 
diff --git a/live/zipl.prm b/live/zipl.prm
index c0709e6d8e..56a2c07e89 100644
--- a/live/zipl.prm
+++ b/live/zipl.prm
@@ -1 +1 @@
-@@KERNEL-ARGS@@ rd.neednet=1 ip=dhcp ignition.firstboot ignition.platform.id=metal
+@@KERNEL-ARGS@@ ignition.firstboot ignition.platform.id=metal
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/39coreos-ignitionnetwork/coreos-NetworkManager.service b/overlay.d/05core/usr/lib/dracut/modules.d/39coreos-ignitionnetwork/coreos-NetworkManager.service
new file mode 100644
index 0000000000..4431919946
--- /dev/null
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/39coreos-ignitionnetwork/coreos-NetworkManager.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Network Manager (CoreOS initrd)
+Wants=network.target
+After=network-pre.target dbus.service
+Before=network.target network.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/libexec/nm-initrd-generator rd.neednet=1 ip=dhcp,dhcp6
+ExecStart=/usr/sbin/NetworkManager --configure-and-quit=initrd --no-daemon
+CapabilityBoundingSet=CAP_NET_ADMIN CAP_DAC_OVERRIDE CAP_NET_RAW CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_MODULE CAP_AUDIT_WRITE CAP_KILL CAP_SYS_CHROOT
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/39coreos-ignitionnetwork/module-setup.sh b/overlay.d/05core/usr/lib/dracut/modules.d/39coreos-ignitionnetwork/module-setup.sh
new file mode 100755
index 0000000000..6f34b21434
--- /dev/null
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/39coreos-ignitionnetwork/module-setup.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+depends() {
+    echo ignition network-manager
+}
+
+install_and_enable_unit() {
+    unit="$1"; shift
+    target="$1"; shift
+    inst_simple "$moddir/$unit" "$systemdsystemunitdir/$unit"
+    mkdir -p "$initdir/$systemdsystemunitdir/$target.requires"
+    ln_r "../$unit" "$systemdsystemunitdir/$target.requires/$unit"
+}
+
+install() {
+    # We're forcibly overriding NM to be run as a service
+    install_and_enable_unit coreos-NetworkManager.service network-online.target
+}