diff --git a/roles/partitioning/defaults/main.yml b/roles/partitioning/defaults/main.yml
index 731037b..b366ee5 100644
--- a/roles/partitioning/defaults/main.yml
+++ b/roles/partitioning/defaults/main.yml
@@ -30,13 +30,13 @@ partitioning_separate_boot: >-
       (system_cfg.luks.enabled | bool)
       or (system_cfg.filesystem != 'btrfs')
     )
-    and (os not in ['archlinux'])
+    and ((os | default('')) not in ['archlinux'])
   }}
 partitioning_boot_fs_fstype: >-
   {{
     system_cfg.filesystem
     if system_cfg.filesystem != 'btrfs'
-    else ('xfs' if is_rhel else 'ext4')
+    else ('xfs' if (is_rhel | default(false) | bool) else 'ext4')
   }}
 partitioning_boot_fs_partition_suffix: >-
   {{
@@ -54,7 +54,7 @@ partitioning_efi_mountpoint: >-
     if (partitioning_separate_boot | bool)
     else (
       '/boot/efi'
-      if is_rhel or (os in ['ubuntu', 'ubuntu-lts'] or (os == 'debian' and (os_version | string) in ['11', '12', '13']))
+      if (is_rhel | default(false) | bool) or ((os | default('')) in ['ubuntu', 'ubuntu-lts'] or ((os | default('')) == 'debian' and (os_version | default('') | string) in ['11', '12', '13']))
       else '/boot'
     )
   }}