diff --git a/debian/changelog b/debian/changelog
index a7cc57c1..affa6317 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 livecd-rootfs (26.04.30) resolute; urgency=medium
 
+  [ Florent 'Skia' Jacquet]
+  * Pick a better manifest by using the live pass for layered images (LP: #2147921)
+
+  [ Dan Bungert ]
   * Exclude boot/grub/i386-pc/eltorito.img from md5sum.txt, as it is expected
     to change in xorriso output.  (LP: #2147162)
 
- -- Dan Bungert <daniel.bungert@canonical.com>  Fri, 03 Apr 2026 18:21:58 -0600
+ -- Florent 'Skia' Jacquet <skia@ubuntu.com>  Mon, 13 Apr 2026 15:16:01 +0200
 
 livecd-rootfs (26.04.29) resolute; urgency=medium
 
diff --git a/live-build/auto/build b/live-build/auto/build
index b633c10b..f57f5160 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -562,9 +562,9 @@ if [ -e "binary/$INITFS/filesystem.manifest" ]; then
 elif [ -e "binary/$INITFS/filesystem.packages" ]; then
 	# '--initramfs none' produces different manifest names.
 	ln "binary/$INITFS/filesystem.packages" "$PREFIX.manifest"
-elif [ -n "$PASSES" ]; then
-	# For layered images, keep the manifest of the last pass
-	for _PASS in $PASSES; do
+elif [ -n "$LIVE_PASSES" ]; then
+	# For layered images, keep the manifest of the last (only?) live pass
+	for _PASS in $LIVE_PASSES; do
 		ln -f "${CASPER_DIR}/$_PASS.manifest.full" "$PREFIX.manifest"
 	done
 fi