diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index 950d88ff44e4a7eaa60aeec3c12ccb17afc79dfe..d6e83d7d9b04c0afda9b5e7af4598dc933e93b30 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -91,6 +91,11 @@ EFI_PROVIDER = "grub-efi"
 MACHINE_FEATURES:qemux86-64 += "efi"
 MACHINE_FEATURES:qemux86 += "efi"
 
+# Add bootindex to qemu boot device to prevent boot order from being changed in ovmf file
+# and not break boot order with EFI. See qemuboot.bbclass for more information
+QB_ROOTFS_EXTRA_OPT:qemux86-64 += ",bootindex=0"
+QB_ROOTFS_EXTRA_OPT:qemux86 += ",bootindex=0"
+
 # Install the grubenv file deployed by oniro-grub-bootconf package into the EFI partition.
 IMAGE_EFI_BOOT_FILES += "grubenv;EFI/BOOT/grubenv"