diff --git a/roles/partitioning/defaults/main.yml b/roles/partitioning/defaults/main.yml
index 4be6cc4..731037b 100644
--- a/roles/partitioning/defaults/main.yml
+++ b/roles/partitioning/defaults/main.yml
@@ -8,6 +8,22 @@ partitioning_efi_end_mib: "{{ (partitioning_efi_start_mib | int) + (partitioning
 partitioning_boot_size_mib: 1024
 partitioning_vg_name: sys
 partitioning_use_full_disk: true
+
+# LVM logical volume sizing
+partitioning_lvm_var_gb: 2
+partitioning_lvm_var_log_gb: 2
+partitioning_lvm_var_log_audit_gb: 1.5
+
+# Disk overhead subtracted from available space in swap/home calculations
+partitioning_disk_overhead_gb: 20
+
+# CIS-required reserved space for /var, /var/log, /var/log/audit, /home
+partitioning_cis_reserved_gb: 7.5
+
+# Home allocation: percentage of (disk - overhead), bounded by min/max
+partitioning_home_allocation_pct: 0.1
+partitioning_home_min_gb: 2
+partitioning_home_max_gb: 20
 partitioning_separate_boot: >-
   {{
     (
diff --git a/roles/partitioning/tasks/main.yml b/roles/partitioning/tasks/main.yml
index 700087a..81d0440 100644
--- a/roles/partitioning/tasks/main.yml
+++ b/roles/partitioning/tasks/main.yml
@@ -286,7 +286,7 @@
             (
               4
               + [
-                (partitioning_disk_size_gb | float) - 20,
+                (partitioning_disk_size_gb | float) - (partitioning_disk_overhead_gb | float),
                 0
               ] | max
             )
@@ -311,7 +311,7 @@
                 (
                   (partitioning_disk_size_gb | float)
                   - (partitioning_reserved_gb | float)
-                  - (system_cfg.features.cis.enabled | ternary(7.5, 0))
+                  - (system_cfg.features.cis.enabled | ternary(partitioning_cis_reserved_gb | float, 0))
                   - partitioning_lvm_extent_reserve_gb
                   - 4
                 ),
@@ -326,14 +326,14 @@
             (
               (partitioning_disk_size_gb | float)
               - (partitioning_reserved_gb | float)
-              - (system_cfg.features.cis.enabled | ternary(7.5, 0))
+              - (system_cfg.features.cis.enabled | ternary(partitioning_cis_reserved_gb | float, 0))
               - partitioning_lvm_extent_reserve_gb
               - partitioning_lvm_swap_target_limited_gb
             ) | float
           }}
         partitioning_lvm_home_gb: >-
           {{
-            ([([(((partitioning_disk_size_gb | float) - 20) * 0.1), 2] | max), 20] | min)
+            ([([((partitioning_disk_size_gb | float) - (partitioning_disk_overhead_gb | float)) * (partitioning_home_allocation_pct | float), (partitioning_home_min_gb | float)] | max), (partitioning_home_max_gb | float)] | min)
           }}
         partitioning_lvm_root_default_gb: >-
           {{
@@ -375,7 +375,10 @@
                 - (partitioning_lvm_swap_gb | float)
                 - partitioning_lvm_extent_reserve_gb
                 - (
-                    (partitioning_lvm_home_gb | float) + 5.5
+                    (partitioning_lvm_home_gb | float)
+                    + (partitioning_lvm_var_gb | float)
+                    + (partitioning_lvm_var_log_gb | float)
+                    + (partitioning_lvm_var_log_audit_gb | float)
                     if system_cfg.features.cis.enabled
                     else 0
                   )
@@ -401,9 +404,9 @@
           size: "{{ partitioning_lvm_swap_gb | string + 'G' }}"
         - lv: home
           size: "{{ partitioning_lvm_home_gb | string + 'G' }}"
-        - { lv: var, size: "2G" }
-        - { lv: var_log, size: "2G" }
-        - { lv: var_log_audit, size: "1.5G" }
+        - { lv: var, size: "{{ partitioning_lvm_var_gb }}G" }
+        - { lv: var_log, size: "{{ partitioning_lvm_var_log_gb }}G" }
+        - { lv: var_log_audit, size: "{{ partitioning_lvm_var_log_audit_gb }}G" }
 
 - name: Create filesystems
   block: