diff --git a/live/config-cdroot/fix_bootconfig.aarch64 b/live/config-cdroot/fix_bootconfig.aarch64
index 12d3056f97..f53a3afd68 100755
--- a/live/config-cdroot/fix_bootconfig.aarch64
+++ b/live/config-cdroot/fix_bootconfig.aarch64
@@ -19,11 +19,21 @@ fi
 # but that's not the case.
 test -f $dst/.profile && . $dst/.profile
 
+arch=`uname -m`
+profile=$(echo "$kiwi_profiles" | tr "-" " ")
+label="$profile ($arch)"
+
+if [ -d "$dst/boot/grub2/themes/SLE" ]; then
+  theme="SLE"
+else
+  theme="openSUSE"
+end
+
 #
 # Create grub.cfg
 #
 cat >$dst/boot/grub2/grub.cfg <<XXX
-# kiwi generated one time grub2 config file
+# Agama generated grub2 config file
 set btrfs_relative_path="y"
 export btrfs_relative_path
 search --file --set=root /boot/0x11cebed2
@@ -43,10 +53,10 @@ if [ "\${grub_platform}" = "efi" ]; then
 fi
 set gfxmode=auto
 set font=(\$root)/boot/aarch64/loader/grub2/fonts/unicode.pf2
-set ascii_font=grub2/themes/openSUSE/ascii.pf2
-set sans_bold_14_font=grub2/themes/openSUSE/DejaVuSans-Bold14.pf2
-set sans_10_font=grub2/themes/openSUSE/DejaVuSans10.pf2
-set sans_12_font=grub2/themes/openSUSE/DejaVuSans12.pf2
+set ascii_font=grub2/themes/$theme/ascii.pf2
+set sans_bold_14_font=grub2/themes/$theme/DejaVuSans-Bold14.pf2
+set sans_10_font=grub2/themes/$theme/DejaVuSans10.pf2
+set sans_12_font=grub2/themes/$theme/DejaVuSans12.pf2
 if [ -f \${font} ];then
     loadfont \${font}
 fi
@@ -62,26 +72,26 @@ fi
 if [ -f (\$root)/boot/\${sans_12_font} ];then
     loadfont (\$root)/boot/\${sans_12_font}
 fi
-if [ -f (\$root)/boot/grub2/themes/openSUSE/theme.txt ];then
-    set theme=(\$root)/boot/grub2/themes/openSUSE/theme.txt
+if [ -f (\$root)/boot/grub2/themes/$theme/theme.txt ];then
+    set theme=(\$root)/boot/grub2/themes/$theme/theme.txt
 fi
 terminal_input console
 terminal_output gfxterm
-menuentry "$kiwi_iname" --class os --unrestricted {
+menuentry "Install $label" --class os --unrestricted {
     set gfxpayload=keep
     echo Loading kernel...
     linux (\$root)/boot/aarch64/loader/linux \${extra_cmdline} \${isoboot}
     echo Loading initrd...
     initrd (\$root)/boot/aarch64/loader/initrd
 }
-menuentry "Failsafe -- $kiwi_iname" --class os --unrestricted {
+menuentry "Failsafe -- Install $label" --class os --unrestricted {
     set gfxpayload=keep
     echo Loading kernel...
-    linux (\$root)/boot/aarch64/loader/linux \${extra_cmdline} \${isoboot}   ide=nodma apm=off noresume edd=off nomodeset 3
+    linux (\$root)/boot/aarch64/loader/linux \${extra_cmdline} \${isoboot} ide=nodma apm=off noresume edd=off nomodeset 3
     echo Loading initrd...
     initrd (\$root)/boot/aarch64/loader/initrd
 }
-menuentry "Mediacheck" --class os --unrestricted {
+menuentry "Check Installation Medium" --class os --unrestricted {
     set gfxpayload=keep
     echo Loading kernel...
     linux (\$root)/boot/aarch64/loader/linux mediacheck=1 plymouth.enable=0 \${isoboot}
@@ -99,6 +109,16 @@ if [ "\${grub_platform}" = "efi" ]; then
         set textmode=true
         terminal_output console
     }
+    menuentry "UEFI Firmware Settings" {
+        fwsetup --is-supported
+        if [ "$?" = 0 ]; then
+            fwsetup
+        else
+            echo "Your firmware doesn't support setup menu entry from a boot loader"
+            echo "Press any key to return ..."
+            read
+        fi
+    }
 fi
 XXX
 
diff --git a/live/config-cdroot/fix_bootconfig.ppc64le b/live/config-cdroot/fix_bootconfig.ppc64le
index 32577f6037..cc3d89205e 100755
--- a/live/config-cdroot/fix_bootconfig.ppc64le
+++ b/live/config-cdroot/fix_bootconfig.ppc64le
@@ -76,12 +76,18 @@ fi
 
 chmod 644 $boot_dir/{initrd,linux}
 
+arch=`uname -m`
+profile=$(echo "$kiwi_profiles" | tr "-" " ")
+label="$profile ($arch)"
+
 # Create grub.cfg.
 #
 cat >$dst/boot/grub2/grub.cfg <<XXX
+# Agama generated grub2 config file
+
 gfxmode=auto
 
-set default="$kiwi_iname"
+set default="Install $label"
 
 insmod gettext
 
@@ -89,14 +95,14 @@ if sleep --interruptible 0 ; then
   timeout=60
 fi
 
-menuentry "$kiwi_iname" --class os --unrestricted {
+menuentry "Install $label" --class os --unrestricted {
   echo 'Loading kernel...'
   linux /boot/ppc64le/linux
   echo 'Loading initrd...'
   initrd /boot/ppc64le/initrd
 }
 
-menuentry "Check Installation Media -- $kiwi_iname" --class os --unrestricted {
+menuentry "Check Installation Medium" --class os --unrestricted {
   echo 'Loading kernel...'
   linux /boot/ppc64le/linux mediacheck=1 plymouth.enable=0
   echo 'Loading initrd...'
diff --git a/live/config-cdroot/fix_bootconfig.x86_64 b/live/config-cdroot/fix_bootconfig.x86_64
index 64ac6bbb00..82e60beb2d 100755
--- a/live/config-cdroot/fix_bootconfig.x86_64
+++ b/live/config-cdroot/fix_bootconfig.x86_64
@@ -19,11 +19,21 @@ fi
 # but that's not the case.
 test -f $dst/.profile && . $dst/.profile
 
+arch=`uname -m`
+profile=$(echo "$kiwi_profiles" | tr "-" " ")
+label="$profile ($arch)"
+
+if [ -d "$dst/boot/grub2/themes/SLE" ]; then
+  theme="SLE"
+else
+  theme="openSUSE"
+fi
+
 #
 # Create grub.cfg
 #
 cat >$dst/boot/grub2/grub.cfg <<XXX
-# kiwi generated one time grub2 config file
+# Agama generated grub2 config file
 set btrfs_relative_path="y"
 export btrfs_relative_path
 search --file --set=root /boot/0xebe87947
@@ -43,10 +53,10 @@ if [ "\${grub_platform}" = "efi" ]; then
 fi
 set gfxmode=auto
 set font=(\$root)/boot/x86_64/loader/grub2/fonts/unicode.pf2
-set ascii_font=grub2/themes/openSUSE/ascii.pf2
-set sans_bold_14_font=grub2/themes/openSUSE/DejaVuSans-Bold14.pf2
-set sans_10_font=grub2/themes/openSUSE/DejaVuSans10.pf2
-set sans_12_font=grub2/themes/openSUSE/DejaVuSans12.pf2
+set ascii_font=grub2/themes/$theme/ascii.pf2
+set sans_bold_14_font=grub2/themes/$theme/DejaVuSans-Bold14.pf2
+set sans_10_font=grub2/themes/$theme/DejaVuSans10.pf2
+set sans_12_font=grub2/themes/$theme/DejaVuSans12.pf2
 if [ -f \${font} ];then
     loadfont \${font}
 fi
@@ -62,26 +72,26 @@ fi
 if [ -f (\$root)/boot/\${sans_12_font} ];then
     loadfont (\$root)/boot/\${sans_12_font}
 fi
-if [ -f (\$root)/boot/grub2/themes/openSUSE/theme.txt ];then
-    set theme=(\$root)/boot/grub2/themes/openSUSE/theme.txt
+if [ -f (\$root)/boot/grub2/themes/$theme/theme.txt ];then
+    set theme=(\$root)/boot/grub2/themes/$theme/theme.txt
 fi
 terminal_input console
 terminal_output gfxterm
-menuentry "$kiwi_iname" --class os --unrestricted {
+menuentry "Install $label" --class os --unrestricted {
     set gfxpayload=keep
     echo Loading kernel...
     linux (\$root)/boot/x86_64/loader/linux \${extra_cmdline} \${isoboot}
     echo Loading initrd...
     initrd (\$root)/boot/x86_64/loader/initrd
 }
-menuentry "Failsafe -- $kiwi_iname" --class os --unrestricted {
+menuentry "Failsafe -- Install $label" --class os --unrestricted {
     set gfxpayload=keep
     echo Loading kernel...
-    linux (\$root)/boot/x86_64/loader/linux \${extra_cmdline} \${isoboot}   ide=nodma apm=off noresume edd=off nomodeset 3
+    linux (\$root)/boot/x86_64/loader/linux \${extra_cmdline} \${isoboot} ide=nodma apm=off noresume edd=off nomodeset 3
     echo Loading initrd...
     initrd (\$root)/boot/x86_64/loader/initrd
 }
-menuentry "Mediacheck" --class os --unrestricted {
+menuentry "Check Installation Medium" --class os --unrestricted {
     set gfxpayload=keep
     echo Loading kernel...
     linux (\$root)/boot/x86_64/loader/linux mediacheck=1 plymouth.enable=0 \${isoboot}
@@ -107,6 +117,15 @@ if [ "\${grub_platform}" = "efi" ]; then
         set textmode=true
         terminal_output console
     }
+    menuentry "UEFI Firmware Settings" {
+        fwsetup --is-supported
+        if [ "$?" = 0 ]; then
+            fwsetup
+        else
+            echo "Your firmware doesn't support setup menu entry from a boot loader"
+            echo "Press any key to return ..."
+            read
+        fi
+    }
 fi
 XXX
-
diff --git a/live/src/agama-installer.changes b/live/src/agama-installer.changes
index cac686670e..52f970006b 100644
--- a/live/src/agama-installer.changes
+++ b/live/src/agama-installer.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Feb  7 08:10:46 UTC 2025 - Ladislav Slezák <lslezak@suse.com>
+
+- Use better ISO Volume ID labels (bsc#1236401)
+- Improve also the boot menu labels
+- Use the graphical boot menu also in SLE
+- Added UEFI firmware settings boot menu option
+
 -------------------------------------------------------------------
 Tue Feb  4 13:25:35 UTC 2025 - Ladislav Slezák <lslezak@suse.com>
 
diff --git a/live/src/agama-installer.kiwi b/live/src/agama-installer.kiwi
index 4350da69b2..e21daff199 100644
--- a/live/src/agama-installer.kiwi
+++ b/live/src/agama-installer.kiwi
@@ -9,11 +9,14 @@
         <specification>Agama Live ISO</specification>
     </description>
     <profiles>
-        <profile name="Leap" description="openSUSE Leap image" import="true" />
+        <!-- use at most 16 characters for the profile name, it is used in the ISO Volume ID -->
+        <!-- which is limited to max. 32 characters -->
+        <profile name="Leap-16.0" description="openSUSE Leap image" import="true" />
         <profile name="openSUSE" description="openSUSE multiproduct image" import="true" />
-        <profile name="SLE" description="SLE-based image" import="true" />
-        <profile name="openSUSE-PXE" description="openSUSE OEM image for remote instalaltion" import="true" />
-        <profile name="Leap-PXE" description="openSUSE Leap OEM image for remote installation" import="true" />
+        <!-- TODO: add SPx in the future -->
+        <profile name="SUSE-SLE-16" description="SLE-based image" import="true" />
+        <profile name="openSUSE-PXE" description="openSUSE OEM image for remote installation" import="true" />
+        <profile name="Leap-16.0-PXE" description="openSUSE Leap OEM image for remote installation" import="true" />
     </profiles>
     <preferences>
         <version>11.0.0</version>
@@ -26,24 +29,25 @@
         <bootsplash-theme>bgrt</bootsplash-theme>
         <bootloader-theme>openSUSE</bootloader-theme>
     </preferences>
-    <preferences arch="ppc64le" profiles="openSUSE,SLE,Leap">
-        <type image="iso" flags="dmsquash"  firmware="ofw" mediacheck="true" volid="agama" editbootconfig="fix_bootconfig">
+    <!-- the ISO Volume ID is set by the fix_bootconfig script -->
+    <preferences arch="ppc64le" profiles="openSUSE,SUSE-SLE-16,Leap-16.0">
+        <type image="iso" flags="dmsquash"  firmware="ofw" mediacheck="true" editbootconfig="fix_bootconfig">
             <bootloader name="grub2" console="serial" timeout="10"/>
         </type>
     </preferences>
-    <preferences arch="aarch64,x86_64" profiles="openSUSE,SLE,Leap">
-        <type image="iso" flags="dmsquash" firmware="uefi" mediacheck="true" volid="agama" editbootconfig="fix_bootconfig">
+    <preferences arch="aarch64,x86_64" profiles="openSUSE,SUSE-SLE-16,Leap-16.0">
+        <type image="iso" flags="dmsquash" firmware="uefi" mediacheck="true" editbootconfig="fix_bootconfig">
             <bootloader name="grub2" timeout="10"/>
         </type>
     </preferences>
-    <preferences arch="s390x" profiles="openSUSE,SLE,Leap">
-        <type image="iso" flags="dmsquash" mediacheck="true" volid="agama" editbootconfig="fix_bootconfig">
+    <preferences arch="s390x" profiles="openSUSE,SUSE-SLE-16,Leap-16.0">
+        <type image="iso" flags="dmsquash" mediacheck="true" editbootconfig="fix_bootconfig">
             <bootloader name="custom" />
         </type>
     </preferences>
-    <preferences arch="ppc64le" profiles="openSUSE-PXE,Leap-PXE">
+    <preferences arch="ppc64le" profiles="openSUSE-PXE,Leap-16.0-PXE">
         <!-- For some reason the compression results on ppc64le are not as good as on the other archs -->
-        <type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" firmware="ofw" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=3174400" volid="agama">
+        <type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" firmware="ofw" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=3174400">
             <bootloader name="grub2" console="serial" timeout="1"/>
             <oemconfig>
                 <oem-skip-verify>true</oem-skip-verify>
@@ -55,8 +59,8 @@
             <size unit="M">3000</size>
         </type>
     </preferences>
-    <preferences arch="s390x" profiles="openSUSE-PXE,Leap-PXE">
-        <type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=2097152" volid="agama">
+    <preferences arch="s390x" profiles="openSUSE-PXE,Leap-16.0-PXE">
+        <type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=2097152">
             <bootloader name="custom"/>
             <oemconfig>
                 <oem-skip-verify>true</oem-skip-verify>
@@ -68,8 +72,8 @@
             <size unit="M">1900</size>
         </type>
     </preferences>
-    <preferences arch="aarch64,x86_64" profiles="openSUSE-PXE,Leap-PXE">
-        <type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" firmware="uefi" installiso="true" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=2097152" volid="agama">
+    <preferences arch="aarch64,x86_64" profiles="openSUSE-PXE,Leap-16.0-PXE">
+        <type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" firmware="uefi" installiso="true" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=2097152">
             <bootloader name="grub2" timeout="1"/>
             <oemconfig>
                 <oem-skip-verify>true</oem-skip-verify>
@@ -88,7 +92,7 @@
     <repository type="rpm-md">
         <source path="obsrepositories:/"/>
     </repository>
-    <packages type="image" profiles="openSUSE-PXE,Leap-PXE">
+    <packages type="image" profiles="openSUSE-PXE,Leap-16.0-PXE">
         <package name="dracut-kiwi-oem-repart"/>
         <package name="dracut-kiwi-oem-dump"/>
         <archive name="root-openSUSE-PXE.tar.xz"/>
@@ -162,7 +166,7 @@
         <archive name="root.tar.xz"/>
     </packages>
     <!-- additional packages for the Leap distributions -->
-    <packages type="image" profiles="Leap,Leap-PXE">
+    <packages type="image" profiles="Leap-16.0,Leap-16.0-PXE">
         <package name="agama-products-opensuse"/>
         <package name="grub2-branding-openSUSE" arch="aarch64,x86_64"/>
         <package name="openSUSE-repos-Leap"/>
@@ -182,7 +186,7 @@
         <package name="MozillaFirefox-branding-openSUSE"/>
     </packages>
     <!-- additional packages for the SLE distributions -->
-    <packages type="image" profiles="SLE">
+    <packages type="image" profiles="SUSE-SLE-16">
         <package name="agama-products-sle"/>
         <package name="grub2-branding-SLE" arch="aarch64,x86_64"/>
         <package name="patterns-sles-base"/>
@@ -197,14 +201,14 @@
         <package name="ca-certificates"/>
         <package name="ca-certificates-mozilla"/>
     </packages>
-    <packages type="bootstrap" profiles="Leap,Leap-PXE">
+    <packages type="bootstrap" profiles="Leap-16.0,Leap-16.0-PXE">
         <package name="Leap-release"/>
     </packages>
     <packages type="bootstrap" profiles="openSUSE,openSUSE-PXE">
         <package name="openSUSE-release"/>
         <package name="openSUSE-release-ftp"/>
     </packages>
-    <packages type="bootstrap" profiles="SLE">
+    <packages type="bootstrap" profiles="SUSE-SLE-16">
         <package name="SLES-release"/>
     </packages>
 </image>
diff --git a/live/src/config.sh b/live/src/config.sh
index 607fe25094..c68c27e4da 100644
--- a/live/src/config.sh
+++ b/live/src/config.sh
@@ -72,8 +72,9 @@ systemctl disable YaST2-Firstboot.service
 systemctl disable YaST2-Second-Stage.service
 
 ### setup dracut for live system
-label=${kiwi_install_volid:-$kiwi_iname}
 arch=$(uname -m)
+# keep in sync with ISO Volume ID set in the fix_bootconfig script
+label="Install-$kiwi_profiles-$arch"
 
 echo "Setting default live root: live:LABEL=$label"
 mkdir /etc/cmdline.d
diff --git a/live/src/fix_bootconfig b/live/src/fix_bootconfig
index 26357f7c25..77ec7b6416 100644
--- a/live/src/fix_bootconfig
+++ b/live/src/fix_bootconfig
@@ -15,7 +15,6 @@
 #
 set -ex
 
-
 dst=${1#iso:}
 
 # KIWI config
@@ -27,11 +26,6 @@ fi
 
 arch=`uname -m`
 
-# removing live root setting from command line - it's in /etc/cmdline.d instead
-if [ -f $dst/boot/grub2/grub.cfg ] ; then
-  sed -i -E -e 's/\s+root=\S+//' -e 's/\s+rd.live\.image//' $dst/boot/grub2/grub.cfg
-fi
-
 bootfix=$dst/fix_bootconfig.$arch
 if [ -f $bootfix ] ; then
   echo "bootconfig script found: \"$bootfix\""
@@ -55,22 +49,14 @@ for i in "\$@" ; do
     export iso="\$i"
     continue
   fi
-  if [ -n "\$volid_opt" ] ; then
-    volid_opt=
-    export volid="\$i"
-    continue
-  fi
   if [ "\$i" = "-outdev" ] ; then
     iso_opt=1
     continue
   fi
-  if [ "\$i" = "-volid" ] ; then
-    volid_opt=1
-    continue
-  fi
 done
 
-volid=${kiwi_install_volid:-$kiwi_iname}
+# keep in sync with ISO Volume ID set in the config.sh script
+volid="Install-$kiwi_profiles-$arch"
 
 [ -x $bootfix ] && $bootfix $dst
 rm -f $dst/fix_bootconfig.* $dst/.profile
@@ -87,6 +73,7 @@ case $arch in
     ;;
   *)
     /usr/bin/xorriso "\$@" -volid "\$volid"
+    err=\$?
 esac
 
 exit \$err