diff --git a/debian/changelog b/debian/changelog
index d68220da..264eb4f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.825) UNRELEASED; urgency=medium
+
+  * For canary images, actually consider moving the seed listed snaps from
+    both minimal and standard layers to the classic layer.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Thu, 13 Apr 2023 11:46:37 +0200
+
 livecd-rootfs (2.824) lunar; urgency=medium
 
   * Fix build failures of desktop raspi images due to canary hooks
diff --git a/live-build/auto/config b/live-build/auto/config
index 483beeff..46ba25fd 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -745,10 +745,16 @@ case $PROJECT in
 				add_package minimal cloud-init
 				# the standard layer, contains all base common packages for later layers (we're splitting out the snaps)
 				add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages
-				# the classic layer, basically only contains snaps from the standard tasks
+				# the classic layer, basically only contains snaps from the standard and minimal tasks
 				add_pass minimal.standard.classic
-				mv config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.full \
-					config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.classic.full
+				if [ -e "config/package-lists/livecd-rootfs.snaplist.chroot_minimal.full" ]; then
+					cat config/package-lists/livecd-rootfs.snaplist.chroot_minimal.full >>config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.classic.full
+					rm config/package-lists/livecd-rootfs.snaplist.chroot_minimal.full
+				fi
+				if [ -e "config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.full" ]; then
+					cat config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.full >>config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.classic.full
+					rm config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.full
+				fi
 				# the live layer, contains all packages for the live session installer
 				# TODO: we should probably add the kernel per KERNEL_FLAVOURS
 				add_package minimal.standard.live linux-generic casper lvm2 mdadm