diff --git a/debian/changelog b/debian/changelog
index b6a0116a..84236db8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+livecd-rootfs (2.817) lunar; urgency=medium
+
+  [ John Chittum ]
+  * revert ipc change. kernel 6.2 will have the correct setting 
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 27 Mar 2023 12:11:06 -0700
+
+livecd-rootfs (2.816) lunar; urgency=medium
+
+  [ Chad Smith ]
+  * Replace cloud-init.service on NetworkManager images to address an ordering
+    cycle interfering with autoinstall with ubuntu-desktop-installer.
+    (LP: #2008952)
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Fri, 24 Mar 2023 18:35:46 -0600
+
 livecd-rootfs (2.815) lunar; urgency=medium
 
   [ Dan Bungert ]
diff --git a/live-build/apparmor/generic/ipc/posix_mqueue b/live-build/apparmor/generic/ipc/posix_mqueue
new file mode 100644
index 00000000..c20f9f93
--- /dev/null
+++ b/live-build/apparmor/generic/ipc/posix_mqueue
@@ -0,0 +1 @@
+create read write open delete setattr getattr
diff --git a/live-build/functions b/live-build/functions
index e1f00005..1e81de9b 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -4,6 +4,8 @@
 imagesize=${IMAGE_SIZE:-2361393152}
 fs_label="${FS_LABEL:-rootfs}"
 
+AUTOMATION_HEADER="# Automatically generated by installer build process"
+
 rootfs_dev_mapper=
 loop_device=
 loop_raw=
@@ -1010,6 +1012,7 @@ EOF
         # inform cloud-init of the same (LP: #1982855)
         mkdir -p chroot/etc/cloud/cloud.cfg.d
         cat <<EOF > chroot/etc/cloud/cloud.cfg.d/99-installer-use-networkmanager.cfg
+${AUTOMATION_HEADER}
 # Let NetworkManager manage all devices on this system
 system_info:
   network:
@@ -1017,6 +1020,50 @@ system_info:
     activators: ['network-manager']
 EOF
 
+        # Position cloud-init.service After=NetworkManager.service.
+        # (LP: #2008952).
+        # We override the entire cloud-init.service definition because
+        # systemd drop-in files only allow adding Before/After constraints
+        # yet we are dropping the Before=sysinit.target from the upstream
+        # cloud-init.service.
+        # This override can be dropped when NetworkManager.service can run
+        # Before=sysinit.target when it drops strict dbus.service dependency.
+        cat <<EOF > chroot/lib/systemd/system/cloud-init.service
+${AUTOMATION_HEADER}
+# Based on cloud-init 23.1 for Desktop LiveCD
+[Unit]
+Description=Initial cloud-init job (metadata service crawler)
+DefaultDependencies=no
+Wants=cloud-init-local.service
+Wants=sshd-keygen.service
+Wants=sshd.service
+After=cloud-init-local.service
+After=systemd-networkd-wait-online.service
+# Installer Added After=NetworkManager* ordering
+After=NetworkManager.service
+After=NetworkManager-wait-online.service
+After=networking.service
+Before=network-online.target
+Before=sshd-keygen.service
+Before=sshd.service
+# Before=sysinit.target  Installer removed to allow for NM dependency
+Before=shutdown.target
+Conflicts=shutdown.target
+Before=systemd-user-sessions.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/cloud-init init
+RemainAfterExit=yes
+TimeoutSec=0
+
+# Output needs to appear in instance console output
+StandardOutput=journal+console
+
+[Install]
+WantedBy=cloud-init.target
+EOF
+
         # Allow cloud-init clean to inform of strict network-manager config
         mkdir -p chroot/etc/cloud/clean.d
         cat <<EOF > chroot/etc/cloud/clean.d/99-installer-use-networkmanager