diff --git a/features.in/build-vm/lib/90-build-vm.mk b/features.in/build-vm/lib/90-build-vm.mk
index 53c815e9..85ec5a4d 100644
--- a/features.in/build-vm/lib/90-build-vm.mk
+++ b/features.in/build-vm/lib/90-build-vm.mk
@@ -30,7 +30,7 @@ prepare-image: check-sudo
 
 convert-image: prepare-image
 	@case "$(IMAGE_TYPE)" in \
-	"img") VM_FORMAT="raw";; \
+	"img") mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; exit 0;; \
 	"vhd") VM_FORMAT="vpc";; \
 	*) VM_FORMAT="$(IMAGE_TYPE)"; \
 	esac; \
@@ -39,6 +39,7 @@ convert-image: prepare-image
 	else \
 		qemu-img convert -O "$$VM_FORMAT" \
 			"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
+		rm "$(VM_RAWDISK)"; \
 	fi
 
 run-image-scripts: GLOBAL_ROOTPW := $(ROOTPW)