diff --git a/config/sources/families/include/uefi_common.inc b/config/sources/families/include/uefi_common.inc
index 70f8ba2e0..a8b8ec9c4 100644
--- a/config/sources/families/include/uefi_common.inc
+++ b/config/sources/families/include/uefi_common.inc
@@ -36,12 +36,10 @@ if [[ "${QEMU_UBOOT_BOOTCONFIG}" != "" ]]; then
 	declare -g BOOTSCRIPT="boot-qemu-${LINUXFAMILY}.cmd:boot.cmd"
 	declare -g BOOTDIR="qemu-uboot-${LINUXFAMILY}"
 	declare -g BOOTBRANCH='tag:v2023.01'
-	declare -g BOOTSOURCE='https://github.com/u-boot/u-boot'        # Gotta set this again, it is unset by grub extension
-	declare -g UBOOT_TARGET_MAP="all;;u-boot.rom"                   # Can't find the target that produces 'u-boot.rom', so for now 'make all'
-	declare -g PACKAGE_LIST_FAMILY="spice-vdagent qemu-guest-agent" # Nice-to-have packages for running under qemu
+	declare -g BOOTSOURCE='https://github.com/u-boot/u-boot' # Gotta set this again, it is unset by grub extension
+	declare -g UBOOT_TARGET_MAP="all;;u-boot.rom"            # Can't find the target that produces 'u-boot.rom', so for now 'make all'
 	declare -g BOOTCONFIG="${QEMU_UBOOT_BOOTCONFIG}"
-	declare -g PACKAGE_LIST_FAMILY_REMOVE="plymouth" # Nice-to-have packages for running under qemu
-	declare -g PLYMOUTH="no"                         # try with smaller initrd?
+	add_packages_to_image spice-vdagent qemu-guest-agent # Nice-to-have packages for running under qemu
 
 	# A patch to convert to `q35` machine type DTS (x86 only)
 	declare -g BOOTPATCHDIR="u-boot-qemu-${LINUXFAMILY}"
diff --git a/lib/functions/configuration/package-lists.sh b/lib/functions/configuration/package-lists.sh
index 77fcb7d91..f36b05ff3 100644
--- a/lib/functions/configuration/package-lists.sh
+++ b/lib/functions/configuration/package-lists.sh
@@ -7,7 +7,7 @@ function get_caller_reference() {
 	declare -g caller_reference="${caller_ref}:${caller_file}:${caller_line}"
 }
 
-# Adds to the main package list.
+# Adds to the main package list. Using this causes an immediate miss on any cached/standard rootfs.
 function add_packages_to_rootfs() {
 	get_caller_reference
 	declare -g -a EXTRA_PACKAGES_ROOTFS=("${EXTRA_PACKAGES_ROOTFS[@]}")
@@ -32,6 +32,7 @@ function add_packages_to_image() {
 }
 
 # Removes a package from all lists: debootstrap, rootfs, desktop and image.
+# Using this causes an immediate miss on any cached/standard rootfs.
 function remove_packages() {
 	get_caller_reference
 	declare -g -a REMOVE_PACKAGES=("${REMOVE_PACKAGES[@]}")