diff --git a/live/config-cdroot/fix_bootconfig.aarch64 b/live/config-cdroot/fix_bootconfig.aarch64
index f51261b107..68d221d7af 100755
--- a/live/config-cdroot/fix_bootconfig.aarch64
+++ b/live/config-cdroot/fix_bootconfig.aarch64
@@ -20,7 +20,7 @@ fi
 test -f $dst/.profile && . $dst/.profile
 
 arch=`uname -m`
-profile=$(echo "$kiwi_profiles" | tr "-" " ")
+profile=$(echo "$kiwi_profiles" | tr "_" " ")
 label="$profile ($arch)"
 
 if [ -d "$dst/boot/grub2/themes/SLE" ]; then
@@ -36,7 +36,6 @@ cat >$dst/boot/grub2/grub.cfg <<XXX
 # Agama generated grub2 config file
 set btrfs_relative_path="y"
 export btrfs_relative_path
-search --file --set=root /boot/0x11cebed2
 set default=0
 if [ -n "\$extra_cmdline" ]; then
   submenu "Bootable snapshot \$snapshot_num" {
diff --git a/live/config-cdroot/fix_bootconfig.x86_64 b/live/config-cdroot/fix_bootconfig.x86_64
index 9e90cc4f78..f6258fb874 100755
--- a/live/config-cdroot/fix_bootconfig.x86_64
+++ b/live/config-cdroot/fix_bootconfig.x86_64
@@ -20,7 +20,7 @@ fi
 test -f $dst/.profile && . $dst/.profile
 
 arch=`uname -m`
-profile=$(echo "$kiwi_profiles" | tr "-" " ")
+profile=$(echo "$kiwi_profiles" | tr "_" " ")
 label="$profile ($arch)"
 
 if [ -d "$dst/boot/grub2/themes/SLE" ]; then
@@ -36,7 +36,6 @@ cat >$dst/boot/grub2/grub.cfg <<XXX
 # Agama generated grub2 config file
 set btrfs_relative_path="y"
 export btrfs_relative_path
-search --file --set=root /boot/0xebe87947
 set default=0
 if [ -n "\$extra_cmdline" ]; then
   submenu "Bootable snapshot \$snapshot_num" {
diff --git a/live/src/agama-installer.changes b/live/src/agama-installer.changes
index 897ce5dcc6..32ed8c7e7a 100644
--- a/live/src/agama-installer.changes
+++ b/live/src/agama-installer.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue May 13 16:56:56 UTC 2025 - Ladislav Slezák <lslezak@suse.com>
+
+- Do not set the root in /boot/grub2/grub.cfg file, it was wrong
+  and the root is already set in the /boot/grub2/earlyboot.cfg
+  file (bsc#1236873)
+- Replace underscores in the boot menu label by spaces
+
 -------------------------------------------------------------------
 Wed May  7 07:07:33 UTC 2025 - Ladislav Slezák <lslezak@suse.com>