diff --git a/profiles/calculate.env b/profiles/calculate.env
index 883189a11..8f7199325 100644
--- a/profiles/calculate.env
+++ b/profiles/calculate.env
@@ -9,7 +9,7 @@ os_linux_name = Calculate Linux
 [install]
 cl_autopartition_bios_grub_size = 10485760
 cl_autopartition_boot_size = 536870912
-cl_autopartition_root_size_default = 16106127360
+cl_autopartition_root_size_default = 21474836480
 cl_autopartition_root_size_min = 7516192768
 cl_autopartition_table = gpt
 cl_distfiles_path = /var/calculate/distfiles
diff --git a/profiles/default/server/calculate.env b/profiles/default/server/calculate.env
index 1e0c4c746..4dd87a884 100644
--- a/profiles/default/server/calculate.env
+++ b/profiles/default/server/calculate.env
@@ -1,3 +1,6 @@
+[install]
+cl_autopartition_root_size_default = 10737418240
+
 [main]
 os_linux_shortname = server
 os_linux_system = server