diff --git a/preseed/debian/jessie/preseed.cfg b/preseed/debian/jessie/preseed.cfg
index 25f08a9..98614e0 100644
--- a/preseed/debian/jessie/preseed.cfg
+++ b/preseed/debian/jessie/preseed.cfg
@@ -90,13 +90,12 @@ d-i   mirror/suite                                string
 ## Account
 #####################################################################
 # Allow login as root?
-d-i   passwd/root-login                             boolean  true
+user-setup-udeb  passwd/root-login                boolean  true
 # Root password in clear text
-d-i   passwd/root-password                          password r00tme
-d-i   passwd/root-password-again                    password r00tme
-# ... or encrypted with MD5 hash
-# with `printf "r00tme" | mkpasswd -s -m md5`
-#d-i   passwd/root-password-crypted                  password $1t.ta/19E8.0À9..ats.sar.jaruiv138e
+#d-i   passwd/root-password                        password r00tme
+#d-i   passwd/root-password-again                  password r00tme
+# ... or encrypted with {MD5, SHA512, …) hash
+d-i   passwd/root-password-crypted                password $6$ceGTxMxc$gXajYByJna1cfTjaST3TcF0FfrlSAaEcmCiOMq/DBOuD0tlu8VYQosZPgwcFT4bCuODMErU/fgRxZEeu9c10V0
 
 # Create a normal user account now?
 d-i   passwd/make-user                              boolean false
@@ -213,7 +212,7 @@ d-i   partman-auto/expert_recipe                    string    \
                       label{ root }                           \
                       mountpoint{ / }                         \
               .                                               \
-              4000 7000 5000 ext4                             \
+              4000 7000 10000 ext4                            \
                       $lvmok{ }                               \
                       in_vg{ sys } lv_name{ lv_usr }          \
                       method{ format } format{ }              \
@@ -222,7 +221,7 @@ d-i   partman-auto/expert_recipe                    string    \
                       label{ usr }                            \
                       mountpoint{ /usr }                      \
               .                                               \
-              4000 6000 5000 ext4                             \
+              4000 6000 10000 ext4                            \
                       $lvmok{ }                               \
                       in_vg{ sys } lv_name{ lv_var }          \
                       method{ format } format{ }              \
@@ -250,7 +249,7 @@ d-i   partman-auto/expert_recipe                    string    \
                       label{ home }                           \
                       mountpoint{ /home }                     \
               .                                               \
-              512 3000 1000 ext4                              \
+              512 3000 2000 ext4                              \
                       $lvmok{ }                               \
                       in_vg{ sys } lv_name{ lv_opt }          \
                       method{ format } format{ }              \
diff --git a/preseed/debian/stable/preseed.cfg b/preseed/debian/stable/preseed.cfg
index 852b316..d17dd77 100644
--- a/preseed/debian/stable/preseed.cfg
+++ b/preseed/debian/stable/preseed.cfg
@@ -78,11 +78,10 @@ d-i   mirror/suite                                string
 # Allow login as root?
 user-setup-udeb  passwd/root-login                boolean  true
 # Root password in clear text
-d-i   passwd/root-password                        password r00tme
-d-i   passwd/root-password-again                  password r00tme
+#d-i   passwd/root-password                        password r00tme
+#d-i   passwd/root-password-again                  password r00tme
 # ... or encrypted with MD5 hash
-# with `printf "r00tme" | mkpasswd -s -m md5`
-#d-i   passwd/root-password-crypted                password $1t.ta/19E8.0À9..ats.sar.jaruiv138e
+d-i   passwd/root-password-crypted                password $6$ceGTxMxc$gXajYByJna1cfTjaST3TcF0FfrlSAaEcmCiOMq/DBOuD0tlu8VYQosZPgwcFT4bCuODMErU/fgRxZEeu9c10V0
 
 # Create a normal user account now?
 user-setup-udeb  passwd/make-user                 boolean  false
@@ -199,7 +198,7 @@ d-i   partman-auto/expert_recipe                    string    \
                       label{ root }                           \
                       mountpoint{ / }                         \
               .                                               \
-              4000 7000 5000 ext4                             \
+              4000 7000 10000 ext4                            \
                       $lvmok{ }                               \
                       in_vg{ sys } lv_name{ lv_usr }          \
                       method{ format } format{ }              \
@@ -208,7 +207,7 @@ d-i   partman-auto/expert_recipe                    string    \
                       label{ usr }                            \
                       mountpoint{ /usr }                      \
               .                                               \
-              4000 6000 5000 ext4                             \
+              4000 6000 10000 ext4                            \
                       $lvmok{ }                               \
                       in_vg{ sys } lv_name{ lv_var }          \
                       method{ format } format{ }              \
@@ -236,7 +235,7 @@ d-i   partman-auto/expert_recipe                    string    \
                       label{ home }                           \
                       mountpoint{ /home }                     \
               .                                               \
-              512 3000 1000 ext4                              \
+              512 3000 2000 ext4                              \
                       $lvmok{ }                               \
                       in_vg{ sys } lv_name{ lv_opt }          \
                       method{ format } format{ }              \