diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_CentOS.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_CentOS.yml
deleted file mode 100644
index 3ea21ea89..000000000
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_CentOS.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-efi_distro: centos
-grub_efi_binary: /boot/efi/EFI/centos/grubx64.efi
-shim_efi_binary: /boot/efi/EFI/centos/shimx64.efi
diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora.yml
deleted file mode 100644
index 5707add31..000000000
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-init_dest_dir: /usr/lib/systemd/system/
-ipxe_dir: /usr/share/ipxe/
-ipxe_full_binary: ipxe.lkrn
-ironic_rootwrap_dir: /usr/bin/
-mysql_service_name: mariadb
-tftp_service_name: tftp
-efi_distro: fedora
-grub_efi_binary: /boot/efi/EFI/fedora/grubx64.efi
-shim_efi_binary: /boot/efi/EFI/fedora/shimx64.efi
-required_packages:
-  - dnsmasq
-  - firewalld
-  - gcc
-  - xorriso
-  - grub2-efi-x64
-  - httpd-tools
-  - ipmitool
-  - ipxe-bootimgs
-  - kpartx
-  - libffi-devel
-  - libxml2-devel
-  - libxslt-devel
-  - mariadb-server
-  - openssl-devel
-  - parted
-  - policycoreutils-python-utils
-  - psmisc
-  - python3-devel
-  - python3-iniparse
-  - python3-libselinux
-  - python3-policycoreutils
-  - python3-PyMySQL
-  - qemu-img
-  - qemu-kvm
-  - shim-x64
-  - socat
-  - syslinux-nonlinux
-  - wget
-  - dosfstools
diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat.yml
deleted file mode 100644
index ced94aef4..000000000
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-efi_distro: rhel
-grub_efi_binary: /boot/efi/EFI/redhat/grubx64.efi
-shim_efi_binary: /boot/efi/EFI/redhat/shimx64.efi
diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml
index 94f75f48a..48e19f34a 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml
@@ -6,6 +6,9 @@ ipxe_efi_binary: ipxe-x86_64.efi
 ironic_rootwrap_dir: /usr/bin/
 mysql_service_name: mariadb
 tftp_service_name: tftp
+efi_distro: "{{ ansible_facts['distribution'] | lower }}"
+grub_efi_binary: "/boot/efi/EFI/{{ efi_distro }}/grubx64.efi"
+shim_efi_binary: "/boot/efi/EFI/{{ efi_distro }}/shimx64.efi"
 required_packages:
   - mariadb-server
   - dnsmasq