diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index 8364354c11..5981572e67 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -263,6 +263,19 @@ outputs:
                 - efi_dev.rc == 0
                 - efi_broken.rc == 0
               block:
+                # WA: some versions of grub2 fail to look for grubenv in /boot/grub2/grubenv
+                # In this case we copy the file instead of creating simlink making sure if
+                # this is the case than grubenv is still available for previous bootrecord.
+                - name: Stat /boot/grub2/grubenv
+                  stat:
+                    path: /boot/grub2/grubenv
+                  register: grubenv
+                - name: Copy /boot/grub2/grubenv to /boot/efi/EFI/redhat/grubenv
+                  when: grubenv.stat.islnk is defined and grubenv.stat.islnk == False
+                  copy:
+                    src: /boot/grub2/grubenv
+                    dest: /boot/efi/EFI/redhat/grubenv
+                    remote_src: true
                 - name: Copy /boot/efi/EFI/redhat to /tmp
                   copy:
                     src: /boot/efi/EFI/redhat/