diff --git a/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/files/original_grub2.cfg b/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/files/original_grub2.cfg
new file mode 100644
index 0000000000..c25d663ddf
--- /dev/null
+++ b/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/files/original_grub2.cfg
@@ -0,0 +1,25 @@
+set timeout=0
+
+# load the grubenv file
+load_env
+
+# selection of the next boot entry via variables 'next_entry' and
+# `saved_entry` present in the 'grubenv' file. Both variables are
+# set by grub tools, like grub2-reboot, grub2-set-default
+
+if [ "${next_entry}" ] ; then
+   set default="${next_entry}"
+   set next_entry=
+   save_env next_entry
+   set boot_once=true
+else
+   set default="${saved_entry}"
+fi
+
+search --no-floppy --set=root --fs-uuid 50cc8d0c-6cae-4993-aa38-5b7209dce8ce
+set boot=${root}
+function load_video {
+  insmod all_video
+}
+${serial}${terminal_input}${terminal_output}
+blscfg
diff --git a/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/files/patched_grub2.cfg b/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/files/patched_grub2.cfg
new file mode 100644
index 0000000000..2aaef62f38
--- /dev/null
+++ b/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/files/patched_grub2.cfg
@@ -0,0 +1,30 @@
+set timeout=0
+
+# <--- Introduced by leapp
+if [ -f ${config_directory}/grubenv ]; then
+  load_env -f ${config_directory}/grubenv
+elif [ -s $prefix/grubenv ]; then
+  load_env
+fi
+# ----->
+
+# selection of the next boot entry via variables 'next_entry' and
+# `saved_entry` present in the 'grubenv' file. Both variables are
+# set by grub tools, like grub2-reboot, grub2-set-default
+
+if [ "${next_entry}" ] ; then
+   set default="${next_entry}"
+   set next_entry=
+   save_env next_entry
+   set boot_once=true
+else
+   set default="${saved_entry}"
+fi
+
+search --no-floppy --set=root --fs-uuid 50cc8d0c-6cae-4993-aa38-5b7209dce8ce
+set boot=${root}
+function load_video {
+  insmod all_video
+}
+${serial}${terminal_input}${terminal_output}
+blscfg