diff --git a/runinstallvm.sh b/runinstallvm.sh
index 9cc74d5..77a1676 100755
--- a/runinstallvm.sh
+++ b/runinstallvm.sh
@@ -1,20 +1,16 @@
 #!/bin/bash
 
-export DISK=$(mktemp -p tmp -t XXXXXXXXXXXXXXXX.img)
-export EFIVAR=tmp/$(basename $DISK .img).fd
-bus=${BUS-pci}
+OUT=${KEEPME-tmp}
+
+mkdir -p $OUT || exit 1
+
+export DISK=$(mktemp -p $OUT -t XXXXXXXXXXXXXXXX.img)
+export EFIVAR=$OUT/$(basename $DISK .img).fd
 
 truncate -s 16G $DISK
 truncate -s 64M $EFIVAR
 
-./runefivm.sh $*
-
-if [ -z "$KEEPME" ]; then
-    rm -f $DISK $EFIVAR
-else
-    mkdir -p "$KEEPME" && mv $DISK $EFIVAR "$KEEPME"/
-    export DISK="$KEEPME"/$(basename $DISK)
-    export EFIVAR="$KEEPME"/$(basename $EFIVAR)
+if [ ! -z "$KEEPME" ]; then
     (cat <<EOF
 #!/bin/bash
 
@@ -26,3 +22,9 @@
     ) >"$KEEPME"/runvm.sh
     chmod a+x "$KEEPME"/runvm.sh
 fi
+
+./runefivm.sh $*
+
+if [ -z "$KEEPME" ]; then
+    rm -f $DISK $EFIVAR
+fi