diff --git a/preseed/debian/wheezy/preseed_cluster.cfg b/preseed/debian/wheezy/preseed_cluster.cfg
index 7fdde2d..83f9d83 100644
--- a/preseed/debian/wheezy/preseed_cluster.cfg
+++ b/preseed/debian/wheezy/preseed_cluster.cfg
@@ -158,25 +158,25 @@ d-i partman-lvm/confirm                         boolean true
 d-i partman-lvm/confirm_nooverwrite             boolean true
 
 # LVM partition
-# This recipe need almost 30Gb free space it's add all <min size>
-#   sda2 (16Gb), lv_* (~14Gb) then it should not count it because
-#   all logical volume are on sda2 ...
+# This recipe need almost 150GB free space to apply all <min size>
+#   sda2 (145GB), lv_* (~140Gb) then it should not count it because
+#   all logical volumes are on sda2 ...
 d-i   partman-auto/expert_recipe                    string    \
       boot-root ::                                            \
-              200 200000 250 ext3                             \
+              200 2000000 250 ext3                            \
                       $primary{ } $bootable{ }                \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext3 }    \
                       label{ boot }                           \
                       mountpoint{ /boot }                     \
               .                                               \
-              148480 100000 -1 ext4                           \
+              148480 1000000 -1 ext4                          \
                       $defaultignore{ }                       \
                       $primary{ }                             \
                       method{ lvm }                           \
                       vg_name{ sys }                          \
               .                                               \
-              25600 8000 30720 ext4                           \
+              25600 90000 30720 ext4                          \
                       $lvmok{ }                               \
                       in_vg{ sys } lv_name{ lv_root }         \
                       method{ format } format{ }              \
@@ -184,7 +184,7 @@ d-i   partman-auto/expert_recipe                    string    \
                       label{ root }                           \
                       mountpoint{ / }                         \
               .                                               \
-              10240 7000 20480 ext4                           \
+              10240 80000 20480 ext4                          \
                       $lvmok{ }                               \
                       in_vg{ sys } lv_name{ lv_usr }          \
                       method{ format } format{ }              \
@@ -193,7 +193,7 @@ d-i   partman-auto/expert_recipe                    string    \
                       label{ usr }                            \
                       mountpoint{ /usr }                      \
               .                                               \
-              4096 6000 8192 ext4                             \
+              4096 70000 8192 ext4                            \
                       $lvmok{ }                               \
                       in_vg{ sys } lv_name{ lv_var }          \
                       method{ format } format{ }              \
@@ -202,7 +202,15 @@ d-i   partman-auto/expert_recipe                    string    \
                       label{ var }                            \
                       mountpoint{ /var }                      \
               .                                               \
-              2048 5000 6144 ext4                             \
+              40960 60000 61440 ext4                          \
+                      $lvmok{ }                               \
+                      in_vg{ sys } lv_name{ lv_opt }          \
+                      method{ format } format{ }              \
+                      use_filesystem{ } filesystem{ ext4 }    \
+                      label{ opt }                            \
+                      mountpoint{ /opt }                      \
+              .                                               \
+              2048 50000 6144 ext4                            \
                       $lvmok{ }                               \
                       in_vg{ sys } lv_name{ lv_tmp }          \
                       method{ format } format{ }              \
@@ -212,20 +220,12 @@ d-i   partman-auto/expert_recipe                    string    \
                       label{ tmp }                            \
                       mountpoint{ /tmp }                      \
               .                                               \
-              40960 4000 61440 ext4                           \
-                      $lvmok{ }                               \
-                      in_vg{ sys } lv_name{ lv_opt }          \
-                      method{ format } format{ }              \
-                      use_filesystem{ } filesystem{ ext4 }    \
-                      label{ opt }                            \
-                      mountpoint{ /opt }                      \
-              .                                               \
-              25% 2000 32768 linux-swap                       \
+              25% 30000 32768 linux-swap                      \
                       $lvmok{ }                               \
                       in_vg{ sys } lv_name{ lv_swap }         \
                       method{ swap } format{ }                \
               .                                               \
-              16000 1000 -1 ext4                              \
+              100 100 -1 ext4                                 \
                       $lvmok{ }                               \
                       in_vg{ sys } lv_name{ lv_workl }        \
                       method{ format } format{ }              \