diff --git a/tripleo_ansible/roles/tripleo_kernel/tasks/kernelargs.yml b/tripleo_ansible/roles/tripleo_kernel/tasks/kernelargs.yml
index 3fce9fc14..a5c9e30f2 100644
--- a/tripleo_ansible/roles/tripleo_kernel/tasks/kernelargs.yml
+++ b/tripleo_ansible/roles/tripleo_kernel/tasks/kernelargs.yml
@@ -31,8 +31,18 @@
         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/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