diff --git a/live-build/auto/build b/live-build/auto/build
index 82a8afde..fb32e8e9 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -113,7 +113,6 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
 			# ubuntu-image twice, once for the core image payload and
 			# then for the actual image.
 			echo "Building the core image payload"
-
 			cd config/
 			/snap/bin/ubuntu-image snap $UBUNTU_IMAGE_PAYLOAD_ARGS \
 				-O output ubuntu-core-desktop*.model-assertion
diff --git a/live-build/auto/config b/live-build/auto/config
index 2ca3e501..7ad2b553 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -516,6 +516,7 @@ case $IMAGEFORMAT in
 				ubuntu-core-desktop)
 					# The ubuntu-core-desktop case is special as we need 2 ubuntu-image calls:
 					# one for the payload and one for the actual image
+					echo "Configuring for additional payload preparation"
 					UBUNTU_IMAGE_PAYLOAD_ARGS="--image-size 12G"
 					EXTRA_SNAPS="$EXTRA_SNAPS eog evince firefox gnome-calculator gnome-characters gnome-clocks gnome-font-viewer gnome-logs gnome-text-editor gnome-weather ubuntu-core-desktop-init"
 					for snap in $EXTRA_SNAPS; do
diff --git a/live-build/ubuntu-core-desktop/ubuntu-core-desktop-22-amd64.model b/live-build/ubuntu-core-desktop/ubuntu-core-desktop-22-amd64.model-assertion
similarity index 100%
rename from live-build/ubuntu-core-desktop/ubuntu-core-desktop-22-amd64.model
rename to live-build/ubuntu-core-desktop/ubuntu-core-desktop-22-amd64.model-assertion