diff --git a/extraconfig/pre_network/boot_param_tasks.yaml b/extraconfig/pre_network/boot_param_tasks.yaml
index 3bc95c5f5a..b70325a9b6 100644
--- a/extraconfig/pre_network/boot_param_tasks.yaml
+++ b/extraconfig/pre_network/boot_param_tasks.yaml
@@ -20,8 +20,19 @@
             dest: /etc/default/grub
             line: 'GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX:+$GRUB_CMDLINE_LINUX }${TRIPLEO_HEAT_TEMPLATE_KERNEL_ARGS}"'
             insertafter: '^TRIPLEO_HEAT_TEMPLATE_KERNEL_ARGS.*'
-        - name: Generate grub config file
-          command: grub2-mkconfig -o /boot/grub2/grub.cfg
+        - name: Check grub config paths
+          stat:
+            path: "{{ item }}"
+          register: grub_stat
+          loop:
+            - /boot/grub2/grub.cfg
+            - /boot/efi/EFI/redhat/grub.cfg
+            - /boot/efi/EFI/centos/grub.cfg
+            - /boot/efi/EFI/fedora/grub.cfg
+        - name: Generate grub config
+          command: "grub2-mkconfig -o {{ item.stat.path }}"
+          when: item.stat.exists|bool
+          loop: "{{ grub_stat.results }}"
         - name: Set reboot required fact
           set_fact:
             reboot_required: true