diff --git a/debian/changelog b/debian/changelog
index 5fc8ab35..ad3ca301 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+livecd-rootfs (2.732) impish; urgency=medium
+
+  [ Michael Hudson-Doyle ]
+  * lb_chroot_layered: fix quoting when searching for
+    trusted.overlay.opaque
+
+  [ Łukasz 'sil2100' Zemczak ]
+  * Revert previous change of fixing /dev sharing - this causes weird
+    autopkgtest issues.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Mon, 02 Aug 2021 22:10:11 +0200
+
+livecd-rootfs (2.731) impish; urgency=medium
+
+  [ Jason C. McDonald ]
+  * Generate manifest for HyperV desktop image
+
+  [ Łukasz 'sil2100' Zemczak ]
+  * Fix sharing of the /dev tree to make sure we can safely umount the chroot
+    when needed. This fixes local non-livefs-builder image builds.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 28 Jul 2021 22:01:56 +0200
+
 livecd-rootfs (2.730) impish; urgency=medium
 
   * Rename subarch of intel-iotg to intel-iot, add support for intel-iot
diff --git a/live-build/auto/config b/live-build/auto/config
index f206c01d..6d5fce11 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -625,7 +625,8 @@ case $PROJECT in
 				add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages
 				add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages
 				add_task minimal.standard.live ubuntu-live
-				add_package minimal.standard.live lupin-casper
+				add_package minimal cloud-init
+				remove_package minimal.standard.live ubiquity-frontend-gtk
 				add_snap minimal.standard.live ubuntu-desktop-installer/classic
 
 				# LANG PASS for minimal and standard
diff --git a/live-build/lb_chroot_layered b/live-build/lb_chroot_layered
index 2c7cbcfa..6529ef2e 100755
--- a/live-build/lb_chroot_layered
+++ b/live-build/lb_chroot_layered
@@ -130,7 +130,7 @@ reduce_pass_size () {
 		if ! diff --brief --no-dereference "$pass_dir/$f" "$parent_pass_dir/$f" >/dev/null; then
 			continue
 		fi
-		p=$(dirname $f)
+		p="$(dirname "$f")"
 		while [ "$p" != . ]; do
 			# As explained in the overlayfs documentation
 			# https://www.kernel.org/doc/html/latest/filesystems/overlayfs.html#whiteouts-and-opaque-directories
@@ -147,7 +147,7 @@ reduce_pass_size () {
 				Echo_message "reduce_pass_size: '%s' would be removed from overlay but for trusted.overlay.opaque on '%s'" "$f" "$p"
 				continue 2
 			fi
-			p=$(dirname $p)
+			p="$(dirname "$p")"
 		done
 		# Files are strictly identical between the 2 passes (only mod or access times differs). No need for unused delta.
 		Echo_message "reduce_pass_size: '%s' is strictly identical between %s and %s. Removing." "$f" "$pass" "$parent"
diff --git a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
index 1b70a23e..9ed8f4c4 100644
--- a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
+++ b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
@@ -136,5 +136,8 @@ qemu-img convert -O vhdx "$raw_img" "$vhd_img"
 rm "$raw_img"
 
 apt-get install -y zip
+
+create_manifest chroot "$vhd_img.zip.manifest"
+
 zip "$vhd_img.zip" "$vhd_img"
 rm "$vhd_img"