diff --git a/exports/iso/04-finalise/01-run.sh b/exports/iso/04-finalise/01-run.sh
index b7f9434..4a5f05f 100755
--- a/exports/iso/04-finalise/01-run.sh
+++ b/exports/iso/04-finalise/01-run.sh
@@ -18,6 +18,9 @@ cat > "${ROOTFS_DIR}/etc/fstab" << 'FSTABEOF'
 tmpfs   /tmp    tmpfs   defaults,nosuid,nodev   0  0
 FSTABEOF
 
+# Remove first-boot trigger — in a live session GDM should use autologin, not gnome-initial-setup.
+rm -f "${ROOTFS_DIR}/var/lib/gdm/run-initial-setup"
+
 if [ -f "${ROOTFS_DIR}/etc/initramfs-tools/update-initramfs.conf" ]; then
 	sed -i 's/^update_initramfs=.*/update_initramfs=yes/' "${ROOTFS_DIR}/etc/initramfs-tools/update-initramfs.conf"
 fi
@@ -73,12 +76,17 @@ insmod all_video
 insmod gfxterm
 
 menuentry "ChillcraftOS Live" {
-	linux /boot/vmlinuz boot=live components live-config.nocomponents splash
+	linux /boot/vmlinuz boot=live components splash
 	initrd /boot/initrd.img
 }
 
 menuentry "ChillcraftOS Live (safe mode)" {
-	linux /boot/vmlinuz boot=live components live-config.nocomponents nomodeset BOOT_DEBUG=2
+	linux /boot/vmlinuz boot=live components nomodeset
+	initrd /boot/initrd.img
+}
+
+menuentry "ChillcraftOS Live (text mode)" {
+	linux /boot/vmlinuz boot=live components systemd.unit=multi-user.target
 	initrd /boot/initrd.img
 }
 GRUBEOF
diff --git a/stage3/02-setup-system/00-run.sh b/stage3/02-setup-system/00-run.sh
index eb4c88e..7dd9624 100755
--- a/stage3/02-setup-system/00-run.sh
+++ b/stage3/02-setup-system/00-run.sh
@@ -7,10 +7,14 @@ mkdir -p "${ROOTFS_DIR}/etc/dconf/db/gnome-initial-setup.d"
 install -m 644 files/dconf-profile "${ROOTFS_DIR}/etc/dconf/profile/user"
 install -m 644 files/dconf-profile-initial-setup "${ROOTFS_DIR}/etc/dconf/profile/gnome-initial-setup"
 
-# Configure default GDM3 Session to Xorg
-mkdir -p "${ROOTFS_DIR}/var/lib/gdm"
+# Configure default GDM3 Session to Wayland (Xorg is being removed)
+#on_chroot << EOF
+#sed -i 's/#WaylandEnable=false/WaylandEnable=true/' /etc/gdm3/daemon.conf
+#EOF
+
+# Enable GDM's Initial setup app
 on_chroot << EOF
-sed -i 's/#WaylandEnable=false/WaylandEnable=false/' /etc/gdm3/daemon.conf
+mkdir -p /var/lib/gdm
 touch /var/lib/gdm/run-initial-setup
 EOF