diff --git a/live-build/auto/config b/live-build/auto/config
index ccb48866..b5d7d471 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -105,7 +105,7 @@ case $PROJECT in
 	ubuntu-cpc)
 		IMAGEFORMAT=ext4
 		;;
-	ubuntu-server-next)
+	ubuntu-server-live)
 		IMAGEFORMAT=plain
 		;;
 esac
@@ -171,7 +171,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
 		ubuntu-server)
 			add_package live oem-config-debconf ubiquity-frontend-debconf
 			;;
-		ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-touch-custom|ubuntu-cpc|ubuntu-desktop-next|ubuntu-server-next)
+		ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-touch-custom|ubuntu-cpc|ubuntu-desktop-next|ubuntu-server-live)
 			;;
 		*)
 			add_package live oem-config-gtk ubiquity-frontend-gtk
@@ -370,12 +370,12 @@ case $PROJECT in
 		PREINSTALL_POOL_SEEDS='server-ship'
 		;;
 
-        ubuntu-server-next)
+	ubuntu-server-live)
 		add_task install minimal
 		add_task install standard
 		add_task install server
-		COMPONENTS='main restricted universe'
-		add_package install cloud-init
+		add_task install cloud-image
+		COMPONENTS='main'
 		;;
 
 	ubuntu-core)
@@ -580,7 +580,7 @@ case $ARCH in
 esac
 
 case $PROJECT in
-	ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-touch-custom|ubuntu-server-next)
+	ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-touch-custom)
 		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
 		KERNEL_FLAVOURS=none
 		BINARY_REMOVE_LINUX=false
@@ -759,7 +759,7 @@ EOF
 		fi
 		;;
 
-	ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*|ubuntu-server-next:*)
+	ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*|ubuntu-server-live:*)
 		cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
 			config/
 		;;
diff --git a/live-build/ubuntu-server-next/functions b/live-build/ubuntu-server-live/functions
similarity index 100%
rename from live-build/ubuntu-server-next/functions
rename to live-build/ubuntu-server-live/functions
diff --git a/live-build/ubuntu-server-next/hooks/01-setup_modules.chroot b/live-build/ubuntu-server-live/hooks/01-setup_modules.chroot
similarity index 100%
rename from live-build/ubuntu-server-next/hooks/01-setup_modules.chroot
rename to live-build/ubuntu-server-live/hooks/01-setup_modules.chroot
diff --git a/live-build/ubuntu-server-next/hooks/030-root-squashfs.binary b/live-build/ubuntu-server-live/hooks/030-root-squashfs.binary
similarity index 92%
rename from live-build/ubuntu-server-next/hooks/030-root-squashfs.binary
rename to live-build/ubuntu-server-live/hooks/030-root-squashfs.binary
index 0925710e..48f60193 100755
--- a/live-build/ubuntu-server-next/hooks/030-root-squashfs.binary
+++ b/live-build/ubuntu-server-live/hooks/030-root-squashfs.binary
@@ -27,7 +27,7 @@ cp -a chroot/* binary/boot/squashfs.dir
 
 apt-get -qqy install squashfs-tools
 
-squashfs_f="${PWD}/livecd.ubuntu-server-next.squashfs"
+squashfs_f="${PWD}/livecd.${PROJECT}.squashfs"
 squashfs_f_manifest="${squashfs_f}.manifest"
 
 dpkg-query --admindir=binary/boot/squashfs.dir/var/lib/dpkg -W > ${squashfs_f_manifest}
diff --git a/live-build/ubuntu-server-next/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server-live/hooks/032-installer-squashfs.binary
similarity index 98%
rename from live-build/ubuntu-server-next/hooks/032-installer-squashfs.binary
rename to live-build/ubuntu-server-live/hooks/032-installer-squashfs.binary
index 08885af6..e50f80ab 100755
--- a/live-build/ubuntu-server-next/hooks/032-installer-squashfs.binary
+++ b/live-build/ubuntu-server-live/hooks/032-installer-squashfs.binary
@@ -161,7 +161,7 @@ umount "binary/boot/squashfs.dir/tmp"
 
 apt-get -qqy install squashfs-tools
 
-squashfs_f="${PWD}/livecd.ubuntu-server-next.installer.squashfs"
+squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"
 
 (cd "$OVERLAY_ROOT/" &&
       mksquashfs . ${squashfs_f} \
diff --git a/live-build/ubuntu-server-next/hooks/99-fix-resolvconf.chroot b/live-build/ubuntu-server-live/hooks/99-fix-resolvconf.chroot
similarity index 100%
rename from live-build/ubuntu-server-next/hooks/99-fix-resolvconf.chroot
rename to live-build/ubuntu-server-live/hooks/99-fix-resolvconf.chroot
diff --git a/live-build/ubuntu-server-next/includes.binary/boot/overlay.dir/lib/systemd/system/multi-user.target.wants/subiquity.service b/live-build/ubuntu-server-live/includes.binary/boot/overlay.dir/lib/systemd/system/multi-user.target.wants/subiquity.service
similarity index 100%
rename from live-build/ubuntu-server-next/includes.binary/boot/overlay.dir/lib/systemd/system/multi-user.target.wants/subiquity.service
rename to live-build/ubuntu-server-live/includes.binary/boot/overlay.dir/lib/systemd/system/multi-user.target.wants/subiquity.service
diff --git a/live-build/ubuntu-server-next/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity-debug@.service b/live-build/ubuntu-server-live/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity-debug@.service
similarity index 100%
rename from live-build/ubuntu-server-next/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity-debug@.service
rename to live-build/ubuntu-server-live/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity-debug@.service
diff --git a/live-build/ubuntu-server-next/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity.service b/live-build/ubuntu-server-live/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity.service
similarity index 100%
rename from live-build/ubuntu-server-next/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity.service
rename to live-build/ubuntu-server-live/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity.service
diff --git a/live-build/ubuntu-server-next/includes.chroot/etc/hosts b/live-build/ubuntu-server-live/includes.chroot/etc/hosts
similarity index 100%
rename from live-build/ubuntu-server-next/includes.chroot/etc/hosts
rename to live-build/ubuntu-server-live/includes.chroot/etc/hosts