diff --git a/roles/partitioning/defaults/main.yml b/roles/partitioning/defaults/main.yml
index a1958cd..637706c 100644
--- a/roles/partitioning/defaults/main.yml
+++ b/roles/partitioning/defaults/main.yml
@@ -9,7 +9,10 @@ partitioning_boot_size_mib: 1024
 partitioning_use_full_disk: true
 partitioning_separate_boot: >-
   {{
-    (system_cfg.luks.enabled | bool)
+    (
+      (system_cfg.luks.enabled | bool)
+      or (system_cfg.filesystem != 'btrfs')
+    )
     and (os not in ['archlinux'])
   }}
 partitioning_boot_fs_fstype: >-