diff --git a/preseed/debian/buster/preseed.cinnamon.uefi.cipher.cfg b/preseed/debian/buster/preseed.cinnamon.uefi.cipher.cfg
index 306fac8..e0a43ca 100644
--- a/preseed/debian/buster/preseed.cinnamon.uefi.cipher.cfg
+++ b/preseed/debian/buster/preseed.cinnamon.uefi.cipher.cfg
@@ -195,15 +195,10 @@ d-i   partman-auto/expert_recipe                  string      \
                       use_filesystem{ } filesystem{ ext3 }    \
                       mountpoint{ /boot }                     \
               .                                               \
-              16000 100000 -1 ext4                            \
-                      $defaultignore{ }                       \
-                      $primary{ }                             \
-                      method{ lvm }                           \
-                      vg_name{ crypt }                        \
-              .                                               \
               1000 8000 3000 ext4                             \
                       $lvmok{ }                               \
-                      in_vg{ crypt } lv_name{ lv_root }       \
+                      $primary{ }                             \
+                      lv_name{ lv_root }                      \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       label{ root }                           \
@@ -211,7 +206,7 @@ d-i   partman-auto/expert_recipe                  string      \
               .                                               \
               4000 7000 10000 ext4                            \
                       $lvmok{ }                               \
-                      in_vg{ crypt } lv_name{ lv_usr }        \
+                      lv_name{ lv_usr }                       \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       options/nodev{ nodev }                  \
@@ -220,7 +215,7 @@ d-i   partman-auto/expert_recipe                  string      \
               .                                               \
               4000 6000 8000 ext4                             \
                       $lvmok{ }                               \
-                      in_vg{ crypt } lv_name{ lv_var }        \
+                      lv_name{ lv_var }                       \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       options/nodev{ nodev }                  \
@@ -229,7 +224,7 @@ d-i   partman-auto/expert_recipe                  string      \
               .                                               \
               1000 5000 2000 ext4                             \
                       $lvmok{ }                               \
-                      in_vg{ crypt } lv_name{ lv_tmp }        \
+                      lv_name{ lv_tmp }                       \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       options/nodev{ nodev }                  \
@@ -239,7 +234,7 @@ d-i   partman-auto/expert_recipe                  string      \
               .                                               \
               2000 4000 10000 ext4                            \
                       $lvmok{ }                               \
-                      in_vg{ crypt } lv_name{ lv_home }       \
+                      lv_name{ lv_home }                      \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       options/nodev{ nodev }                  \
@@ -248,7 +243,7 @@ d-i   partman-auto/expert_recipe                  string      \
               .                                               \
               512 3000 4000 ext4                              \
                       $lvmok{ }                               \
-                      in_vg{ crypt } lv_name{ lv_opt }        \
+                      lv_name{ lv_opt }                       \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       label{ opt }                            \
@@ -256,12 +251,12 @@ d-i   partman-auto/expert_recipe                  string      \
               .                                               \
               512 1000 100% linux-swap                        \
                       $lvmok{ }                               \
-                      in_vg{ crypt } lv_name{ lv_swap }       \
+                      lv_name{ lv_swap }                      \
                       method{ swap } format{ }                \
               .                                               \
               100 100 -1 ext3                                 \
                       $lvmok{ }                               \
-                      in_vg{ crypt } lv_name{ lv_free }       \
+                      lv_name{ lv_free }                      \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext3 }    \
                       label{ free }                           \
diff --git a/preseed/debian/buster/preseed.gnome.uefi.cipher.cfg b/preseed/debian/buster/preseed.gnome.uefi.cipher.cfg
index 2be285b..4f20d12 100644
--- a/preseed/debian/buster/preseed.gnome.uefi.cipher.cfg
+++ b/preseed/debian/buster/preseed.gnome.uefi.cipher.cfg
@@ -195,15 +195,10 @@ d-i   partman-auto/expert_recipe                  string      \
                       use_filesystem{ } filesystem{ ext3 }    \
                       mountpoint{ /boot }                     \
               .                                               \
-              16000 100000 -1 ext4                            \
-                      $defaultignore{ }                       \
-                      $primary{ }                             \
-                      method{ lvm }                           \
-                      vg_name{ crypt }                        \
-              .                                               \
               1000 8000 3000 ext4                             \
                       $lvmok{ }                               \
-                      in_vg{ crypt } lv_name{ lv_root }       \
+                      $primary{ }                             \
+                      lv_name{ lv_root }                      \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       label{ root }                           \
@@ -211,7 +206,7 @@ d-i   partman-auto/expert_recipe                  string      \
               .                                               \
               4000 7000 10000 ext4                            \
                       $lvmok{ }                               \
-                      in_vg{ crypt } lv_name{ lv_usr }        \
+                      lv_name{ lv_usr }                       \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       options/nodev{ nodev }                  \
@@ -220,7 +215,7 @@ d-i   partman-auto/expert_recipe                  string      \
               .                                               \
               4000 6000 8000 ext4                             \
                       $lvmok{ }                               \
-                      in_vg{ crypt } lv_name{ lv_var }        \
+                      lv_name{ lv_var }                       \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       options/nodev{ nodev }                  \
@@ -229,7 +224,7 @@ d-i   partman-auto/expert_recipe                  string      \
               .                                               \
               1000 5000 2000 ext4                             \
                       $lvmok{ }                               \
-                      in_vg{ crypt } lv_name{ lv_tmp }        \
+                      lv_name{ lv_tmp }                       \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       options/nodev{ nodev }                  \
@@ -239,7 +234,7 @@ d-i   partman-auto/expert_recipe                  string      \
               .                                               \
               2000 4000 10000 ext4                            \
                       $lvmok{ }                               \
-                      in_vg{ crypt } lv_name{ lv_home }       \
+                      lv_name{ lv_home }                      \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       options/nodev{ nodev }                  \
@@ -248,7 +243,7 @@ d-i   partman-auto/expert_recipe                  string      \
               .                                               \
               512 3000 4000 ext4                              \
                       $lvmok{ }                               \
-                      in_vg{ crypt } lv_name{ lv_opt }        \
+                      lv_name{ lv_opt }                       \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       label{ opt }                            \
@@ -256,12 +251,12 @@ d-i   partman-auto/expert_recipe                  string      \
               .                                               \
               512 1000 100% linux-swap                        \
                       $lvmok{ }                               \
-                      in_vg{ crypt } lv_name{ lv_swap }       \
+                      lv_name{ lv_swap }                      \
                       method{ swap } format{ }                \
               .                                               \
               100 100 -1 ext3                                 \
                       $lvmok{ }                               \
-                      in_vg{ crypt } lv_name{ lv_free }       \
+                      lv_name{ lv_free }                      \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext3 }    \
                       label{ free }                           \