diff --git a/live/config-cdroot/fix_bootconfig.aarch64 b/live/config-cdroot/fix_bootconfig.aarch64
index d85e812602..d6415f69f4 100755
--- a/live/config-cdroot/fix_bootconfig.aarch64
+++ b/live/config-cdroot/fix_bootconfig.aarch64
@@ -9,7 +9,7 @@ set -e
 
 dst="$1"
 
-if [ ! -d "$dst" ] ; then
+if [ ! -d "$dst" ]; then
   echo "fix_bootconfig.aarch64: image dir \"$dst\" not found"
   exit 1
 fi
@@ -19,7 +19,7 @@ fi
 # but that's not the case.
 test -f $dst/.profile && . $dst/.profile
 
-arch=`uname -m`
+arch=$(uname -m)
 profile=$(echo "$kiwi_profiles" | tr "_" " ")
 label="$profile ($arch)"
 
@@ -34,14 +34,12 @@ fi
 #
 cat >$dst/boot/grub2/grub.cfg <<XXX
 # Agama generated grub2 config file
+insmod serial
+insmod read
+
 set btrfs_relative_path="y"
 export btrfs_relative_path
 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
@@ -74,19 +72,30 @@ fi
 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
+
+# if the first serial port is successfully configured allow input/output to it as well
+if serial --unit=0 --speed=9600; then
+    terminal_input console serial
+    terminal_output gfxterm serial
+    set extra_output=serial
+    # this detects that a serial port is present but that does not mean a serial
+    # console is attached there so we cannot for example disable plymouth
+else
+    terminal_input console
+    terminal_output gfxterm
+fi
+
 menuentry "Install $label" --class os --unrestricted {
     set gfxpayload=keep
     echo Loading kernel...
-    linux (\$root)/boot/aarch64/loader/linux \${extra_cmdline} \${isoboot} splash=silent
+    linux (\$root)/boot/aarch64/loader/linux \${isoboot} splash=silent \${plymouth}
     echo Loading initrd...
     initrd (\$root)/boot/aarch64/loader/initrd
 }
 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 \${isoboot} ide=nodma apm=off noresume edd=off nomodeset 3
     echo Loading initrd...
     initrd (\$root)/boot/aarch64/loader/initrd
 }
@@ -100,28 +109,48 @@ menuentry "Check Installation Medium" --class os --unrestricted {
 menuentry "Rescue System" --class os --unrestricted {
     set gfxpayload=keep
     echo Loading kernel...
-    linux (\$root)/boot/aarch64/loader/linux \${extra_cmdline} \${isoboot} $RESCUE_SYSTEM_BOOT_SETTINGS
+    linux (\$root)/boot/aarch64/loader/linux \${isoboot} $RESCUE_SYSTEM_BOOT_SETTINGS
     echo Loading initrd...
     initrd (\$root)/boot/aarch64/loader/initrd
 }
-if [ -f "/.snapshots/grub-snapshot.cfg" ]; then
-    source "/.snapshots/grub-snapshot.cfg"
-fi
+
+hiddenentry "Text mode" --hotkey "t" {
+    set textmode=true
+    set plymouth="plymouth.enable=0"
+    terminal_output console \${extra_output}
+}
+
+hiddenentry "Set Live system password" --hotkey "p" {
+    echo "Enter root password for the installer live system:"
+    read -s live_password
+    echo "Confirm password:"
+    read -s live_password_confirmed
+
+    if [ "\${live_password}" != "\${live_password_confirmed}" ]; then
+        echo "ERROR: The passwords do not match!"
+        echo "Press Enter to return ..."
+        read -s
+    else
+        if [ -z "\${live_password}" ]; then
+            echo "ERROR: The password cannot be empty!"
+            echo "Press Enter to return ..."
+            read -s
+        else
+            set live_options="live.password=\${live_password}"
+        fi
+    fi
+}
+
 if [ "\${grub_platform}" = "efi" ]; then
-    hiddenentry "Text mode" --hotkey "t" {
-        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
+            echo "Press Enter to return ..."
+            read -s
         fi
     }
 fi
 XXX
-
diff --git a/live/config-cdroot/fix_bootconfig.x86_64 b/live/config-cdroot/fix_bootconfig.x86_64
index cb35f3a419..0d4328725a 100755
--- a/live/config-cdroot/fix_bootconfig.x86_64
+++ b/live/config-cdroot/fix_bootconfig.x86_64
@@ -9,7 +9,7 @@ set -e
 
 dst="$1"
 
-if [ ! -d "$dst" ] ; then
+if [ ! -d "$dst" ]; then
   echo "fix_bootconfig.x86_64: image dir \"$dst\" not found"
   exit 1
 fi
@@ -19,7 +19,7 @@ fi
 # but that's not the case.
 test -f $dst/.profile && . $dst/.profile
 
-arch=`uname -m`
+arch=$(uname -m)
 profile=$(echo "$kiwi_profiles" | tr "_" " ")
 label="$profile ($arch)"
 
@@ -34,14 +34,12 @@ fi
 #
 cat >$dst/boot/grub2/grub.cfg <<XXX
 # Agama generated grub2 config file
+insmod serial
+insmod read
+
 set btrfs_relative_path="y"
 export btrfs_relative_path
 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
@@ -74,58 +72,104 @@ fi
 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
+
+# if serial port is successfully configured allow input/output to it as well
+if serial --unit=0 --speed=9600; then
+    terminal_input console serial
+    terminal_output gfxterm serial
+    set extra_output=serial
+    # this detects that a serial port is present but that does not mean a serial
+    # console is attached there so we cannot for example disable plymouth
+else
+    terminal_input console
+    terminal_output gfxterm
+fi
+
 if [ "\${grub_platform}" != "efi" ]; then
-  menuentry "Boot from Hard Disk" --class opensuse --class gnu-linux --class gnu --class os {
-    exit
-  }
+    # classic BIOS boot, try booting from MBR from the first disk
+    menuentry "Boot from Hard Disk" --class os --unrestricted {
+        insmod file
+
+        # check if the first disk contains a valid boot sector
+        if file --is-x86-bios-bootsector (hd0)+1; then
+            chainloader (hd0)+1
+        else
+            echo "The first disk does not seem to be bootable."
+            echo ""
+            echo "If you are sure the system can boot from hard disk"
+            echo "then remove the installation medium and reboot the machine."
+            echo ""
+            echo "Press Enter to return ..."
+            read -s
+        fi
+    }
 fi
+
 menuentry "Install $label" --class os --unrestricted {
     set gfxpayload=keep
     echo Loading kernel...
-    linux (\$root)/boot/x86_64/loader/linux \${extra_cmdline} \${isoboot} splash=silent
+    linux (\$root)/boot/x86_64/loader/linux \${isoboot} splash=silent \${plymouth} \${live_options}
     echo Loading initrd...
     initrd (\$root)/boot/x86_64/loader/initrd
 }
 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 \${isoboot} ide=nodma apm=off noresume edd=off nomodeset 3 \${live_options}
     echo Loading initrd...
     initrd (\$root)/boot/x86_64/loader/initrd
 }
 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}
+    linux (\$root)/boot/x86_64/loader/linux mediacheck=1 plymouth.enable=0 \${isoboot} \${live_options}
     echo Loading initrd...
     initrd (\$root)/boot/x86_64/loader/initrd
 }
 menuentry "Rescue System" --class os --unrestricted {
     set gfxpayload=keep
     echo Loading kernel...
-    linux (\$root)/boot/x86_64/loader/linux \${extra_cmdline} \${isoboot} $RESCUE_SYSTEM_BOOT_SETTINGS
+    linux (\$root)/boot/x86_64/loader/linux \${isoboot} $RESCUE_SYSTEM_BOOT_SETTINGS
     echo Loading initrd...
     initrd (\$root)/boot/x86_64/loader/initrd
 }
 
-if [ -f "/.snapshots/grub-snapshot.cfg" ]; then
-    source "/.snapshots/grub-snapshot.cfg"
-fi
+hiddenentry "Text mode" --hotkey "t" {
+    set textmode=true
+    set plymouth="plymouth.enable=0"
+    terminal_output console \${extra_output}
+}
+
+hiddenentry "Set Live system password" --hotkey "p" {
+    echo "Enter the new root password for the installer live system:"
+    read -s live_password
+    echo "Retype the password again:"
+    read -s live_password_confirmed
+
+    if [ "\${live_password}" != "\${live_password_confirmed}" ]; then
+        echo "ERROR: The passwords do not match!"
+        echo "Press Enter to return ..."
+        read -s
+    else
+        if [ -z "\${live_password}" ]; then
+            echo "ERROR: The password cannot be empty!"
+            echo "Press Enter to return ..."
+            read -s
+        else
+            set live_options="live.password=\${live_password}"
+        fi
+    fi
+}
+
 if [ "\${grub_platform}" = "efi" ]; then
-    hiddenentry "Text mode" --hotkey "t" {
-        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
+            echo "Press Enter to return ..."
+            read -s
         fi
     }
 fi
diff --git a/live/src/agama-installer.changes b/live/src/agama-installer.changes
index 88021668d6..a5d631c4fb 100644
--- a/live/src/agama-installer.changes
+++ b/live/src/agama-installer.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Feb 19 12:55:14 UTC 2026 - Ladislav Slezák <lslezak@suse.com>
+
+- Fixes and improvements in the boot menu for x86_64 and aarch64:
+  - Fixed boot from hard disk in the legacy BIOS mode (x86_64 only)
+  - Added "p" keyboard shortcut to interactively configure the root
+    password for the installer live system
+  - Added support for serial console
+  - Disable plymouth graphical boot when the grub boot menu is
+    switched to text mode with the "t" keyboard shortcut
+
+- Fixed failed image build because of missing configuration options
+  for the "image-janitor" tool
+
+  (gh#agama-project/agama#3192)
+
 -------------------------------------------------------------------
 Wed Feb 18 20:32:37 UTC 2026 - Josef Reidinger <jreidinger@suse.com>
 
diff --git a/live/src/config.sh b/live/src/config.sh
index 1b539cac75..56e3794120 100644
--- a/live/src/config.sh
+++ b/live/src/config.sh
@@ -315,8 +315,8 @@ rpm -e --nodeps alsa alsa-utils alsa-ucm-conf || true
 # make sense on a server.
 du -h -s /lib/modules /lib/firmware
 
-# remove the multimedia drivers
-image-janitor -v driver-cleanup --delete 
+# remove the multimedia drivers, use the default configuration files
+image-janitor -v driver-cleanup --delete --config-files /usr/share/image-janitor/module.list,/usr/share/image-janitor/module.list.extra
 
 # remove the unused firmware(not referenced by kernel drivers)
 image-janitor -v fw-cleanup --delete