diff --git a/overlay/usr/libexec/init-storage b/overlay/usr/libexec/init-storage
index be18b33..1e963c4 100755
--- a/overlay/usr/libexec/init-storage
+++ b/overlay/usr/libexec/init-storage
@@ -15,8 +15,8 @@ copy_var() {
     dev="$1"
 
     echo 'Copying /var contents to data volume'
-    mount -o subvol=var "${dev}" "${tmpdir}"
-    cp -auv /var/. "${tmpdir}"
+    mount -o subvol=var "${dev}" "${tmpdir}" || exit
+    cp -auv /var/. "${tmpdir}" || exit
     umount "${tmpdir}"
 }
 
@@ -46,7 +46,8 @@ else
 fi
 
 trap cleanup INT TERM QUIT EXIT
-tmpdir=$(mktemp -d -p /run storinit.XXXXXX)
+tmpdir=/run/storinit
+mkdir -p "${tmpdir}"
 
 if ! has_fs "${datapart}"; then
     format_dev "${datapart}"