diff --git a/roles/configuration/tasks/bootloader.yml b/roles/configuration/tasks/bootloader.yml
index 59a8c57..096a693 100644
--- a/roles/configuration/tasks/bootloader.yml
+++ b/roles/configuration/tasks/bootloader.yml
@@ -5,7 +5,7 @@
       vars:
         configuration_use_efibootmgr: "{{ is_rhel | default(false) }}"
         configuration_efi_dir: >-
-          {{ "/boot/efi" if os | lower in ["ubuntu", "ubuntu-lts"] else "/boot" }}
+          {{ "/boot/efi" if (is_debian | default(false) or is_rhel | default(false)) else "/boot" }}
         configuration_bootloader_id: >-
           {{ "ubuntu" if os | lower in ["ubuntu", "ubuntu-lts"] else os }}
         configuration_efi_vendor: >-
diff --git a/roles/partitioning/tasks/main.yml b/roles/partitioning/tasks/main.yml
index 3fdf69f..a2ddd78 100644
--- a/roles/partitioning/tasks/main.yml
+++ b/roles/partitioning/tasks/main.yml
@@ -492,7 +492,7 @@
 
     - name: Mount boot filesystem
       ansible.posix.mount:
-        path: "{{ '/mnt/boot/efi' if os | lower in ['rhel8', 'ubuntu', 'ubuntu-lts'] else '/mnt/boot' }}"
+        path: "{{ '/mnt/boot/efi' if (is_debian | default(false) or is_rhel | default(false)) else '/mnt/boot' }}"
         src: UUID={{ partitioning_boot_uuid.stdout }}
         fstype: vfat
         state: mounted