diff --git a/build/debian/build.sh b/build/debian/build.sh
index 3db6a40..7a849a9 100755
--- a/build/debian/build.sh
+++ b/build/debian/build.sh
@@ -57,7 +57,7 @@
 			;;
 	esac
 	if [[ "${*:$OPTIND:1}" ]]; then
-		built_image="${*:$OPTIND:1}"
+		output="${*:$OPTIND:1}"
 	fi
 }
 
@@ -302,7 +302,7 @@
 }
 
 run_fai() {
-	local out="${built_image}"
+	local out="${raw_disk_image}"
 	make -C "${debian_cloud_image}" "image_bookworm_nocloud_${debian_arch}"
 	mv "${debian_cloud_image}/image_bookworm_nocloud_${debian_arch}.raw" "${out}"
 }
@@ -312,7 +312,7 @@
 	bios_partition_num=14
 	efi_partition_num=15
 
-	loop=$(losetup -f --show --partscan $built_image)
+	loop=$(losetup -f --show --partscan $raw_disk_image)
 	dd if="${loop}p$root_partition_num" of=root_part
 	if [[ "$arch" == "x86_64" ]]; then
 		dd if="${loop}p$bios_partition_num" of=bios_part
@@ -320,11 +320,11 @@
 	dd if="${loop}p$efi_partition_num" of=efi_part
 	losetup -d "${loop}"
 
-	sed -i "s/{root_part_guid}/$(sfdisk --part-uuid $built_image $root_partition_num)/g" vm_config.json
+	sed -i "s/{root_part_guid}/$(sfdisk --part-uuid $raw_disk_image $root_partition_num)/g" vm_config.json
 	if [[ "$arch" == "x86_64" ]]; then
-		sed -i "s/{bios_part_guid}/$(sfdisk --part-uuid $built_image $bios_partition_num)/g" vm_config.json
+		sed -i "s/{bios_part_guid}/$(sfdisk --part-uuid $raw_disk_image $bios_partition_num)/g" vm_config.json
 	fi
-	sed -i "s/{efi_part_guid}/$(sfdisk --part-uuid $built_image $efi_partition_num)/g" vm_config.json
+	sed -i "s/{efi_part_guid}/$(sfdisk --part-uuid $raw_disk_image $efi_partition_num)/g" vm_config.json
 }
 
 clean_up() {
@@ -334,7 +334,8 @@
 set -e
 trap clean_up EXIT
 
-built_image=image.raw
+output=images.tar.gz
+raw_disk_image=image.raw
 workdir=$(mktemp -d)
 build_id=$(prepare_build_id)
 debian_cloud_image=${workdir}/debian_cloud_image
@@ -353,7 +354,7 @@
 copy_android_config
 package_custom_kernel
 run_fai
-fdisk -l "${built_image}"
+fdisk -l "${raw_disk_image}"
 images=()
 
 cp "$(dirname "$0")/vm_config.json.${arch}" vm_config.json
@@ -368,7 +369,7 @@
 # TODO(b/365955006): remove these lines when uboot supports x86_64 EFI application
 elif [[ "$arch" == "x86_64" ]]; then
 	rm -f vmlinuz initrd.img
-	virt-get-kernel -a "${built_image}"
+	virt-get-kernel -a "${raw_disk_image}"
 	mv vmlinuz* vmlinuz
 	mv initrd.img* initrd.img
 	images+=(
@@ -381,4 +382,4 @@
 fi
 
 # --sparse option isn't supported in apache-commons-compress
-tar czv -f images.tar.gz ${build_id} "${images[@]}" vm_config.json
+tar czv -f ${output} ${build_id} "${images[@]}" vm_config.json