diff --git a/debian/changelog b/debian/changelog
index 13cc27d2..83f40bd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (24.04.60) UNRELEASED; urgency=medium
+
+  * Drop use of 'laptop' for x13s as this is now migrated to generic.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 08 Apr 2024 21:35:27 -0700
+
 livecd-rootfs (24.04.59) noble; urgency=medium
 
   [ Catherine Redfield ]
diff --git a/live-build/auto/build b/live-build/auto/build
index 501a3098..7b0bcbfd 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -587,9 +587,6 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
 		oem-*)
 			FLAVOUR="oem"
 			;;
-		laptop-*)
-			FLAVOUR="laptop"
-			;;
 		image-intel)
 			FLAVOUR="intel"
 			;;
diff --git a/live-build/auto/config b/live-build/auto/config
index 2bf41eaf..78155da3 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -685,9 +685,6 @@ case $PROJECT in
 			*)
 				touch config/universe-enabled
 				KERNEL_FLAVOURS='generic-hwe-24.04'
-				if [ "$SUBARCH" = "x13s" ]; then
-					KERNEL_FLAVOURS='laptop-23.10'
-				fi
 				PASSES_TO_LAYERS="true"
 				# the minimal layer, for minimal installs
 				add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages