diff --git a/netboot.sh b/netboot.sh
index 29039b6..93bcca9 100755
--- a/netboot.sh
+++ b/netboot.sh
@@ -402,19 +402,20 @@ d-i partman-auto/method string $partitioning_method
 d-i partman-lvm/device_remove_lvm boolean true
 d-i partman-md/device_remove_md boolean true
 d-i partman-lvm/confirm boolean true
-d-i partman-lvm/confirm_nooverwrite boolean true
+d-i partman/confirm_nooverwrite boolean true
 EOF
 
     if [ "$partitioning_method" = "regular" ]; then
-        $save_preseed << EOF
-d-i partman/default_filesystem string $filesystem
-d-i partman-auto/expert_recipe string naive :: 0 1 -1 \$default_filesystem \$primary{ } \$bootable{ } method{ format } format{ } use_filesystem{ } \$default_filesystem{ } mountpoint{ / } .
+        echo "d-i partman/default_filesystem string $filesystem" | $save_preseed
+        $save_preseed << 'EOF'
+d-i partman-auto/expert_recipe string naive :: 0 1 -1 $default_filesystem $primary{ } $bootable{ } method{ format } format{ } use_filesystem{ } $default_filesystem{ } mountpoint{ / } .
 d-i partman-auto/choose_recipe select naive
 d-i partman-basicfilesystems/no_swap boolean false
 EOF
     fi
 
     $save_preseed << EOF
+d-i partman-partitioning/confirm_new_label boolean true
 d-i partman-partitioning/confirm_write_new_label boolean true
 d-i partman/choose_partition select finish
 d-i partman/confirm boolean true