diff --git a/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml b/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml
index 22b83e06ed..a728fbb4ec 100644
--- a/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml
+++ b/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml
@@ -98,3 +98,23 @@ outputs:
           vars:
             tripleo_kernel_args: {get_attr: [RoleParametersValue, value, kernel_args]}
             tripleo_kernel_reboot_timeout: {get_param: NodeRebootWaitTimeout}
+      upgrade_tasks:
+        - name: upgrade prepare for leapp to align kernel arg shortcommings in leapp
+          tags:
+            - never
+            - system_upgrade
+            - system_upgrade_prepare
+          when:
+            - step|int == 3
+            - upgrade_leapp_enabled
+          block:
+            - name: fix grub entries to have name start with GRUB_
+              replace:
+                path: '/etc/default/grub'
+                regexp: '^(TRIPLEO_HEAT_TEMPLATE_KERNEL_ARGS)(.*)'
+                replace: 'GRUB_\1\2'
+            - name: fix grub entries in append statement
+              replace:
+                path: '/etc/default/grub'
+                regexp: '(.*){(TRIPLEO_HEAT_TEMPLATE_KERNEL_ARGS)}(.*)'
+                replace: '\1{GRUB_\2}\3'