diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh
index 05a64cc3f92b..bf0e1325dde7 100755
--- a/release/scripts/mk-vmimage.sh
+++ b/release/scripts/mk-vmimage.sh
@@ -100,9 +100,9 @@ main() {
 	vm_extra_install_ports
 	vm_extra_enable_services
 	vm_extra_pre_umount
+	cleanup
 	vm_create_disk || return 0
 	vm_extra_create_disk
-	cleanup
 
 	return 0
 }