diff --git a/components/boot.xml b/components/boot.xml
index 23191b3..b3f6b13 100644
--- a/components/boot.xml
+++ b/components/boot.xml
@@ -3,11 +3,12 @@
 		<profile name="BootCore" description="Boot core packages"/>
 	</profiles>
 	<packages type="bootstrap" patternType="plusRecommended" profiles="BootCore">
-		<package name="grubby"/>
+		<package name="sdubby"/>
 	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="BootCore">
 		<package name="kernel"/>
 		<package name="kernel-modules-extra"/>
+		<package name="systemd-boot-unsigned"/>
 		<package name="systemd-oomd-defaults"/>
 		<package name="systemd-resolved"/>
 	</packages>
diff --git a/config.sh b/config.sh
index d556a93..b333d50 100755
--- a/config.sh
+++ b/config.sh
@@ -33,17 +33,6 @@ echo 'uninitialized' > /etc/machine-id
 ## remove random seed, the newly installed instance should make its own
 rm -f /var/lib/systemd/random-seed
 
-#======================================
-# Configure grub correctly
-#--------------------------------------
-## Works around issues with grub-bls
-## See: https://github.com/OSInside/kiwi/issues/2198
-echo "GRUB_DEFAULT=saved" >> /etc/default/grub
-## Disable submenus to match Fedora
-echo "GRUB_DISABLE_SUBMENU=true" >> /etc/default/grub
-## Disable recovery entries to match Fedora
-echo "GRUB_DISABLE_RECOVERY=true" >> /etc/default/grub
-
 #======================================
 # Delete & lock the root user password
 #--------------------------------------
diff --git a/platforms/minimal.xml b/platforms/minimal.xml
index 586a273..7995e64 100644
--- a/platforms/minimal.xml
+++ b/platforms/minimal.xml
@@ -7,7 +7,7 @@
 	</profiles>
 	<preferences profiles="Minimal">
 		<type image="oem" filesystem="btrfs" kernelcmdline="" target_blocksize="4096" bootpartition="true" bootpartsize="1024" bootfilesystem="ext4" efipartsize="500" firmware="uefi" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora" fsmountoptions="x-systemd.growfs,compress=zstd:1">
-			<bootloader name="grub2" console="none" timeout="5" timeout_style="menu"/>
+			<bootloader name="systemd_boot"/>
 			<systemdisk name="fedora">
 				<volume name="@root=root"/>
 				<volume name="home" parent="/"/>
diff --git a/platforms/server.xml b/platforms/server.xml
index c91c287..86fc854 100644
--- a/platforms/server.xml
+++ b/platforms/server.xml
@@ -7,7 +7,7 @@
 	</profiles>
 	<preferences profiles="Server">
 		<type image="oem" filesystem="btrfs" kernelcmdline="" target_blocksize="4096" bootpartition="true" bootpartsize="1024" bootfilesystem="ext4" efipartsize="500" firmware="uefi" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora" fsmountoptions="x-systemd.growfs,compress=zstd:1">
-			<bootloader name="grub2" console="none" timeout="5" timeout_style="menu"/>
+			<bootloader name="systemd_boot"/>
 			<systemdisk name="fedora">
 				<volume name="@root=root"/>
 				<volume name="home" parent="/"/>
diff --git a/platforms/workstation.xml b/platforms/workstation.xml
index dfb5798..e7beebc 100644
--- a/platforms/workstation.xml
+++ b/platforms/workstation.xml
@@ -15,7 +15,7 @@
 	</profiles>
 	<preferences profiles="WorkstationCommon">
 		<type image="oem" filesystem="btrfs" kernelcmdline="rhgb quiet" target_blocksize="4096" bootpartition="true" bootpartsize="1024" bootfilesystem="ext4" efipartsize="500" firmware="uefi" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora" fsmountoptions="x-systemd.growfs,compress=zstd:1">
-			<bootloader name="grub2" console="console" timeout="1" timeout_style="hidden"/>
+			<bootloader name="systemd_boot"/>
 			<systemdisk name="fedora">
 				<volume name="@root=root"/>
 				<volume name="home" parent="/"/>