diff --git a/live/README.md b/live/README.md
index f07b2d0515..a37116fa73 100644
--- a/live/README.md
+++ b/live/README.md
@@ -12,6 +12,7 @@
   - [Image Definition](#image-definition)
     - [KIWI Files](#kiwi-files)
   - [Image Configuration](#image-configuration)
+    - [GRUB2 menu](#grub2-menu)
     - [SSH Server](#ssh-server)
     - [Autologin](#autologin)
     - [Firefox Profile](#firefox-profile)
@@ -121,6 +122,15 @@ The main Kiwi source files are located in the [src](src) subdirectory:
 
 The Live ISO is configured to allow using some features and allow running Agama there.
 
+## GRUB2 Menu
+
+grub.cfg, defining boot menu items of the Agama image, is generated by scripts stored in
+[config-cdroot](https://github.com/openSUSE/agama/tree/master/live/config-cdroot).
+
+Both x86_64 and aarch64 grub.cfg are basically copies of KIWI autogenerated grub.cfg.
+The x86_64 grub.cfg contains UEFI fix for Booting from disk (Issue #1609).
+
+
 ### SSH Server
 
 The SSH connection for the root user is enabled in the
diff --git a/live/config-cdroot/fix_bootconfig.aarch64 b/live/config-cdroot/fix_bootconfig.aarch64
new file mode 100755
index 0000000000..4299976f0e
--- /dev/null
+++ b/live/config-cdroot/fix_bootconfig.aarch64
@@ -0,0 +1,102 @@
+#! /bin/bash
+
+# Custom menu to ensure that we boot correctly
+# from local disk on UEFI
+# https://github.com/openSUSE/agama/issues/1609
+# KIWI config
+
+dst="$1"
+
+if [ ! -d "$dst" ] ; then
+  echo "fix_bootconfig.aarch64: image dir \"$dst\" not found"
+  exit 1
+fi
+
+# KIWI config which should normally be inherited
+# from a parent process in our case xorriso
+# but that's not the case.
+test -f $dst/.profile && . $dst/.profile
+
+#
+# Create grub.cfg
+#
+cat >$dst/boot/grub2/grub.cfg <<XXX
+# kiwi generated one time 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" {
+    menuentry "If OK, run snapper rollback and reboot." { true; }
+  }
+fi
+if [ -n "\${iso_path}" ]; then
+    isoboot="iso-scan/filename=\${iso_path}"
+fi
+set timeout=10
+set timeout_style=menu
+if [ "\${grub_platform}" = "efi" ]; then
+    echo "Please press 't' to show the boot menu on this console"
+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
+if [ -f \${font} ];then
+    loadfont \${font}
+fi
+if [ -f (\$root)/boot/\${ascii_font} ];then
+    loadfont (\$root)/boot/\${ascii_font}
+fi
+if [ -f (\$root)/boot/\${sans_bold_14_font} ];then
+    loadfont (\$root)/boot/\${sans_bold_14_font}
+fi
+if [ -f (\$root)/boot/\${sans_10_font} ];then
+    loadfont (\$root)/boot/\${sans_10_font}
+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
+fi
+terminal_input console
+terminal_output gfxterm
+menuentry "$kiwi_iname" --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 {
+    set gfxpayload=keep
+    echo Loading kernel...
+    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 {
+    set gfxpayload=keep
+    echo Loading kernel...
+    linux (\$root)/boot/aarch64/loader/linux mediacheck=1 plymouth.enable=0 \${isoboot}
+    echo Loading initrd...
+    initrd (\$root)/boot/aarch64/loader/initrd
+}
+menuentry "Boot from Hard Disk" --class opensuse --class gnu-linux --class gnu --class os {
+  exit
+}
+if [ -f "/.snapshots/grub-snapshot.cfg" ]; then
+    source "/.snapshots/grub-snapshot.cfg"
+fi
+if [ "\${grub_platform}" = "efi" ]; then
+    hiddenentry "Text mode" --hotkey "t" {
+        set textmode=true
+        terminal_output console
+    }
+fi
+XXX
+
diff --git a/live/config-cdroot/fix_bootconfig.ppc64le b/live/config-cdroot/fix_bootconfig.ppc64le
index 503dea0a36..2f0a75da7c 100755
--- a/live/config-cdroot/fix_bootconfig.ppc64le
+++ b/live/config-cdroot/fix_bootconfig.ppc64le
@@ -44,6 +44,11 @@ if [ ! -d "$dst" ] ; then
   exit 1
 fi
 
+# KIWI config which should normally be inherited
+# from a parent process in our case xorriso
+# but that's not the case.
+test -f $dst/.profile && . $dst/.profile
+
 # ----------------
 
 # Note:
@@ -74,7 +79,7 @@ chmod 644 $boot_dir/{initrd,linux}
 cat >$dst/boot/grub2/grub.cfg <<XXX
 gfxmode=auto
 
-set default='Agama Live'
+set default="$kiwi_iname"
 
 insmod gettext
 
@@ -82,14 +87,14 @@ if sleep --interruptible 0 ; then
   timeout=60
 fi
 
-menuentry 'Agama Live' --class os --unrestricted {
+menuentry "$kiwi_iname" --class os --unrestricted {
   echo 'Loading kernel...'
   linux /boot/ppc64le/linux
   echo 'Loading initrd...'
   initrd /boot/ppc64le/initrd
 }
 
-menuentry 'Check Installation Media -- Agama Live' --class os --unrestricted {
+menuentry "Check Installation Media -- $kiwi_iname" --class os --unrestricted {
   echo 'Loading kernel...'
   linux /boot/ppc64le/linux mediacheck=1 plymouth.enable=0
   echo 'Loading initrd...'
@@ -115,7 +120,7 @@ XXX
 #
 cat >$dst/ppc/bootinfo.txt <<XXX
 <chrp-boot>
-<description>Agama Live</description>
+<description>$kiwi_iname</description>
 <os-name>openSuSE Tumbleweed</os-name>
 <boot-script>boot &device;:1,\boot\grub2\grub.elf</boot-script>
 </chrp-boot>
diff --git a/live/config-cdroot/fix_bootconfig.x86_64 b/live/config-cdroot/fix_bootconfig.x86_64
new file mode 100755
index 0000000000..07e0656e6a
--- /dev/null
+++ b/live/config-cdroot/fix_bootconfig.x86_64
@@ -0,0 +1,110 @@
+#! /bin/bash
+
+# Custom menu to ensure that we boot correctly
+# from local disk on UEFI
+# https://github.com/openSUSE/agama/issues/1609
+# KIWI config
+
+dst="$1"
+
+if [ ! -d "$dst" ] ; then
+  echo "fix_bootconfig.x86_64: image dir \"$dst\" not found"
+  exit 1
+fi
+
+# KIWI config which should normally be inherited
+# from a parent process in our case xorriso
+# but that's not the case.
+test -f $dst/.profile && . $dst/.profile
+
+#
+# Create grub.cfg
+#
+cat >$dst/boot/grub2/grub.cfg <<XXX
+# kiwi generated one time 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" {
+    menuentry "If OK, run snapper rollback and reboot." { true; }
+  }
+fi
+if [ -n "\${iso_path}" ]; then
+    isoboot="iso-scan/filename=\${iso_path}"
+fi
+set timeout=10
+set timeout_style=menu
+if [ "\${grub_platform}" = "efi" ]; then
+    echo "Please press 't' to show the boot menu on this console"
+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
+if [ -f \${font} ];then
+    loadfont \${font}
+fi
+if [ -f (\$root)/boot/\${ascii_font} ];then
+    loadfont (\$root)/boot/\${ascii_font}
+fi
+if [ -f (\$root)/boot/\${sans_bold_14_font} ];then
+    loadfont (\$root)/boot/\${sans_bold_14_font}
+fi
+if [ -f (\$root)/boot/\${sans_10_font} ];then
+    loadfont (\$root)/boot/\${sans_10_font}
+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
+fi
+terminal_input console
+terminal_output gfxterm
+menuentry "$kiwi_iname" --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 {
+    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
+    echo Loading initrd...
+    initrd (\$root)/boot/x86_64/loader/initrd
+}
+menuentry "Mediacheck" --class os --unrestricted {
+    set gfxpayload=keep
+    echo Loading kernel...
+    linux (\$root)/boot/x86_64/loader/linux mediacheck=1 plymouth.enable=0 \${isoboot}
+    echo Loading initrd...
+    initrd (\$root)/boot/x86_64/loader/initrd
+}
+menuentry "Boot from Hard Disk" --class opensuse --class gnu-linux --class gnu --class os {
+  if search --no-floppy --file /efi/boot/fallback.efi --set ; then
+    for os in opensuse sles leap; do
+      if [ -f /efi/\$os/grub.efi ] ; then
+        chainloader /efi/\$os/grub.efi
+        boot
+      fi
+    done
+  fi
+  exit
+}
+if [ -f "/.snapshots/grub-snapshot.cfg" ]; then
+    source "/.snapshots/grub-snapshot.cfg"
+fi
+if [ "\${grub_platform}" = "efi" ]; then
+    hiddenentry "Text mode" --hotkey "t" {
+        set textmode=true
+        terminal_output console
+    }
+fi
+XXX
+
diff --git a/live/src/agama-installer.changes b/live/src/agama-installer.changes
index 8765d812a6..ebf42dd2b0 100644
--- a/live/src/agama-installer.changes
+++ b/live/src/agama-installer.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Sep 16 15:46:23 UTC 2024 - Lubos Kocman <lubos.kocman@suse.com>
+
+- Define boot menu for all arches by scripts in config-cdroot
+  newly added x86_64 and aarch64 write stock copies from kiwi
+  generated grub.cfg
+
+- intel uefi boot fix from "Boot from disk item" (gh#openSUSE/agama#1609)
+
+- Keep -x on purpose for future trubleshooting (advice from Marcus)
+
+- Use $kiwi_iname instead of static agama-live reference in all of
+  config-cdroom/* with exception of s390x, where for some reason
+  we use SUSE Linux... string instead
+  
+
 -------------------------------------------------------------------
 Mon Sep  9 15:55:16 UTC 2024 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>
 
diff --git a/live/src/fix_bootconfig b/live/src/fix_bootconfig
index 05f2087a4d..26357f7c25 100644
--- a/live/src/fix_bootconfig
+++ b/live/src/fix_bootconfig
@@ -13,12 +13,18 @@
 #    This script (a) adjusts the boot config, (b) runs xorriso, and (c) makes
 #    it zIPL bootable on s390x.
 #
+set -ex
 
-# KIWI config
-test -f .profile && . .profile
 
 dst=${1#iso:}
 
+# KIWI config
+# Copy it to $dst from where it can be later read by xorriso
+if [ -f .profile ]; then
+    source .profile
+    cp .profile "$dst"
+fi
+
 arch=`uname -m`
 
 # removing live root setting from command line - it's in /etc/cmdline.d instead
@@ -67,7 +73,7 @@ done
 volid=${kiwi_install_volid:-$kiwi_iname}
 
 [ -x $bootfix ] && $bootfix $dst
-rm -f $dst/fix_bootconfig.*
+rm -f $dst/fix_bootconfig.* $dst/.profile
 
 case $arch in
   s390x)