diff --git a/debian/changelog b/debian/changelog
index aa171cae..eec60ab1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+livecd-rootfs (2.706) hirsute; urgency=medium
+
+  [ Łukasz 'sil2100' Zemczak ]
+  * As per discussion, we might want to keep the UC20 images a bit bigger than
+    what's defined via the gadget/rootfs contents, to make sure writable is
+    comfortably big enough. Use the same hard-coded value as for UC16 and UC18.
+    (LP: #1905990)
+
+  [ Dimitri John Ledkov ]
+  * riscv64: fixup subarch build, unbound variable
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 03 Dec 2020 16:18:21 +0000
+
 livecd-rootfs (2.705) hirsute; urgency=medium
 
   * config: on hirsute build UC22 images
diff --git a/live-build/auto/config b/live-build/auto/config
index 34a765aa..a051be23 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -361,11 +361,8 @@ case $IMAGEFORMAT in
 			case $MODEL in
 				pc-amd64|pc-i386)
 					if [ -z "${SUBARCH:-}" ]; then
-						case $SUITE in
-							xenial|bionic)
-								UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
-								;;
-						esac
+						# This is to make sure there's enough writable space
+						UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
 					fi
 					;;
 				*) ;;
diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
index 2960fac0..080dab51 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
@@ -137,12 +137,12 @@ install_grub() {
 
             if [ -n "${SUBARCH:-}" ]; then
                 chroot mountpoint apt-get install -qqy u-boot-sifive
-                dd if=mountpoint/usr/lib/u-boot/sifive_fu540/u-boot-spl.bin of=$loader1
-                dd if=mountpoint/usr/lib/u-boot/sifive_fu540/u-boot.itb of=$loader2
                 # FSBL, which gets U-Boot SPL
                 loader1="/dev/mapper${loop_device///dev/}p13"
                 # The real U-Boot
                 loader2="/dev/mapper${loop_device///dev/}p14"
+                dd if=mountpoint/usr/lib/u-boot/sifive_fu540/u-boot-spl.bin of=$loader1
+                dd if=mountpoint/usr/lib/u-boot/sifive_fu540/u-boot.itb of=$loader2
                 # Provide end-user modifyable CIDATA
                 cidata_dev="/dev/mapper${loop_device///dev/}p12"
                 setup_cidata "${cidata_dev}"