diff --git a/live-build/auto/config b/live-build/auto/config
index 8912fc30..c94c2178 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -483,7 +483,6 @@ case $IMAGEFORMAT in
 			for snap in $EXTRA_SNAPS; do
 				UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --extra-snaps $snap"
 			done
-			echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
 			echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
 			# Store model assertion in top dir to get it picked up later as a build artifact
 			env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion
@@ -512,6 +511,7 @@ case $IMAGEFORMAT in
 		fi
 
 		# Save the model name used for building, mostly for any model-specific hook execution
+		echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
 		echo "MODEL=$MODEL" >> config/common
 		# Fake finished configuration for lb build
 		mkdir -p .build