diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
index 0abf28fa8..238ef9acd 100644
--- a/package/yast2-bootloader.changes
+++ b/package/yast2-bootloader.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov 21 15:23:42 UTC 2025 - Stefan Schubert <schubi@suse.de>
+
+- Enable grub2-bls for arm and riscv64 (bnc#1253222).
+- Replacing dbus-uuidgen by systemd-machine-id-setup.
+- 5.0.29
+
 -------------------------------------------------------------------
 Thu Nov 20 10:19:58 UTC 2025 - Stefan Schubert <schubi@suse.de>
 
diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
index 85e9d51f1..f7fd728d1 100644
--- a/package/yast2-bootloader.spec
+++ b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        5.0.28
+Version:        5.0.29
 Release:        0
 Summary:        YaST2 - Bootloader Configuration
 License:        GPL-2.0-or-later
@@ -55,8 +55,6 @@ Requires:       rubygem(%rb_default_ruby_abi:cfa_grub2) >= 1.0.1
 # lenses are needed here
 Requires:       augeas-lenses
 Requires:       yast2-ruby-bindings >= 1.0.0
-# dbus-uuidgen needed by BLS
-Requires:       dbus-1-tools
 
 # only recommend syslinux, as it is not needed when generic mbr is not used (bsc#1004229)
 %ifarch %ix86 x86_64
diff --git a/src/lib/bootloader/bls.rb b/src/lib/bootloader/bls.rb
index a8c63671a..b3a29e50e 100644
--- a/src/lib/bootloader/bls.rb
+++ b/src/lib/bootloader/bls.rb
@@ -155,8 +155,7 @@ def self.set_authentication
     def self.generate_machine_id
       Yast::SCR.Execute(Yast::Path.new(".target.remove"), "/etc/machine-id")
       begin
-        Yast::Execute.on_target!("/usr/bin/dbus-uuidgen",
-          "--ensure=/etc/machine-id")
+        Yast::Execute.on_target!("/bin/systemd-machine-id-setup")
       rescue Cheetah::ExecutionFailed => e
         Yast::Report.Error(
           format(_(
diff --git a/src/lib/bootloader/bootloader_factory.rb b/src/lib/bootloader/bootloader_factory.rb
index 5b3f7e8ed..e718a78d9 100644
--- a/src/lib/bootloader/bootloader_factory.rb
+++ b/src/lib/bootloader/bootloader_factory.rb
@@ -110,12 +110,20 @@ def bootloader_by_name(name)
     private
 
       def use_systemd_boot?
+        # only these architectures are supported.
         Yast::ProductFeatures.GetBooleanFeature("globals", "enable_systemd_boot") &&
-          (Yast::Arch.x86_64 || Yast::Arch.aarch64) # only these architectures are supported.
+          (Yast::Arch.x86_64 ||
+           Yast::Arch.aarch64 ||
+           Yast::Arch.arm ||
+           Yast::Arch.riscv64)
       end
 
       def use_grub2_bls?
-        (Yast::Arch.x86_64 || Yast::Arch.aarch64) # only these architectures are supported.
+        # only these architectures are supported.
+        (Yast::Arch.x86_64 ||
+         Yast::Arch.aarch64 ||
+         Yast::Arch.arm ||
+         Yast::Arch.riscv64)
       end
 
       def grub2_efi_installable?
@@ -124,7 +132,11 @@ def grub2_efi_installable?
       end
 
       def bls_installable?
-        ((Yast::Arch.x86_64 || Yast::Arch.i386 || Yast::Arch.aarch64) && Systeminfo.efi?)
+        ((Yast::Arch.x86_64 ||
+          Yast::Arch.i386 ||
+          Yast::Arch.aarch64 ||
+          Yast::Arch.arm ||
+          Yast::Arch.riscv64) && Systeminfo.efi?)
       end
 
       def proposed_name
diff --git a/test/bls_test.rb b/test/bls_test.rb
index 4f615869a..ea7d15a57 100644
--- a/test/bls_test.rb
+++ b/test/bls_test.rb
@@ -71,8 +71,7 @@
       expect(Yast::Execute).to receive(:on_target!)
         .with("/usr/bin/sdbootutil", "enroll", "--method=fido2", "--devices=/dev/vda3")
       expect(Yast::Execute).to receive(:on_target!)
-        .with("/usr/bin/dbus-uuidgen",
-          "--ensure=/etc/machine-id")
+        .with("/bin/systemd-machine-id-setup")
 
       subject.set_authentication
     end