diff --git a/live-build/ubuntu-core-desktop/includes.chroot.live/etc/cloud/cloud.cfg b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/cloud/cloud.cfg
similarity index 100%
rename from live-build/ubuntu-core-desktop/includes.chroot.live/etc/cloud/cloud.cfg
rename to live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/cloud/cloud.cfg
diff --git a/live-build/ubuntu-core-desktop/includes.chroot.live/etc/cloud/cloud.cfg.d/06_quiet.cfg b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/cloud/cloud.cfg.d/06_quiet.cfg
similarity index 100%
rename from live-build/ubuntu-core-desktop/includes.chroot.live/etc/cloud/cloud.cfg.d/06_quiet.cfg
rename to live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/cloud/cloud.cfg.d/06_quiet.cfg
diff --git a/live-build/ubuntu-core-desktop/includes.chroot.live/etc/systemd/journald.conf.d/no-rate-limit.conf b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/systemd/journald.conf.d/no-rate-limit.conf
similarity index 100%
rename from live-build/ubuntu-core-desktop/includes.chroot.live/etc/systemd/journald.conf.d/no-rate-limit.conf
rename to live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/systemd/journald.conf.d/no-rate-limit.conf
diff --git "a/live-build/ubuntu-core-desktop/includes.chroot.live/etc/systemd/system/dev-disk-by\\x2duuid-00c629d6\\x2d06ab\\x2d4dfd\\x2db21e\\x2dc3186f34105d.device.d/override.conf" "b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/systemd/system/dev-disk-by\\x2duuid-00c629d6\\x2d06ab\\x2d4dfd\\x2db21e\\x2dc3186f34105d.device.d/override.conf"
similarity index 100%
rename from "live-build/ubuntu-core-desktop/includes.chroot.live/etc/systemd/system/dev-disk-by\\x2duuid-00c629d6\\x2d06ab\\x2d4dfd\\x2db21e\\x2dc3186f34105d.device.d/override.conf"
rename to "live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/systemd/system/dev-disk-by\\x2duuid-00c629d6\\x2d06ab\\x2d4dfd\\x2db21e\\x2dc3186f34105d.device.d/override.conf"
diff --git a/live-build/ubuntu-core-desktop/includes.chroot.live/etc/systemd/system/systemd-journald.service.d/no-compact.conf b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/systemd/system/systemd-journald.service.d/no-compact.conf
similarity index 100%
rename from live-build/ubuntu-core-desktop/includes.chroot.live/etc/systemd/system/systemd-journald.service.d/no-compact.conf
rename to live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/systemd/system/systemd-journald.service.d/no-compact.conf
diff --git a/live-build/ubuntu-core-desktop/includes.chroot.live/etc/systemd/system/systemd-journald.service.d/no-hardening.conf b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/systemd/system/systemd-journald.service.d/no-hardening.conf
similarity index 100%
rename from live-build/ubuntu-core-desktop/includes.chroot.live/etc/systemd/system/systemd-journald.service.d/no-hardening.conf
rename to live-build/ubuntu-core-desktop/includes.chroot.minimal.live/etc/systemd/system/systemd-journald.service.d/no-hardening.conf
diff --git a/live-build/ubuntu-core-desktop/includes.chroot.live/usr/bin/subiquity-shell b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/bin/subiquity-shell
similarity index 100%
rename from live-build/ubuntu-core-desktop/includes.chroot.live/usr/bin/subiquity-shell
rename to live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/bin/subiquity-shell
diff --git a/live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/system/getty@.service.d/autologin.conf b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/getty@.service.d/autologin.conf
similarity index 100%
rename from live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/system/getty@.service.d/autologin.conf
rename to live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/getty@.service.d/autologin.conf
diff --git a/live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/system/getty@tty1.service b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/getty@tty1.service
similarity index 100%
rename from live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/system/getty@tty1.service
rename to live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/getty@tty1.service
diff --git a/live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/system/local-fs.target.wants/media-filesystem.mount b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/local-fs.target.wants/media-filesystem.mount
similarity index 100%
rename from live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/system/local-fs.target.wants/media-filesystem.mount
rename to live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/local-fs.target.wants/media-filesystem.mount
diff --git a/live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf
similarity index 100%
rename from live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf
rename to live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf
diff --git a/live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf
similarity index 100%
rename from live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf
rename to live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf
diff --git a/live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf
similarity index 100%
rename from live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf
rename to live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf
diff --git a/live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/system/snapd.service.d/no-reexec.conf b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/snapd.service.d/no-reexec.conf
similarity index 100%
rename from live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/system/snapd.service.d/no-reexec.conf
rename to live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/snapd.service.d/no-reexec.conf
diff --git a/live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/system/subiquity_config.mount b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/subiquity_config.mount
similarity index 100%
rename from live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/system/subiquity_config.mount
rename to live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/system/subiquity_config.mount
diff --git a/live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/systemd-networkd-wait-online b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/systemd-networkd-wait-online
similarity index 100%
rename from live-build/ubuntu-core-desktop/includes.chroot.live/usr/lib/systemd/systemd-networkd-wait-online
rename to live-build/ubuntu-core-desktop/includes.chroot.minimal.live/usr/lib/systemd/systemd-networkd-wait-online
diff --git a/live-build/ubuntu-core-desktop/includes.chroot.live/var/lib/cloud/seed/nocloud/meta-data b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/var/lib/cloud/seed/nocloud/meta-data
similarity index 100%
rename from live-build/ubuntu-core-desktop/includes.chroot.live/var/lib/cloud/seed/nocloud/meta-data
rename to live-build/ubuntu-core-desktop/includes.chroot.minimal.live/var/lib/cloud/seed/nocloud/meta-data
diff --git a/live-build/ubuntu-core-desktop/includes.chroot.live/var/lib/cloud/seed/nocloud/user-data b/live-build/ubuntu-core-desktop/includes.chroot.minimal.live/var/lib/cloud/seed/nocloud/user-data
similarity index 100%
rename from live-build/ubuntu-core-desktop/includes.chroot.live/var/lib/cloud/seed/nocloud/user-data
rename to live-build/ubuntu-core-desktop/includes.chroot.minimal.live/var/lib/cloud/seed/nocloud/user-data