diff --git a/fedora-riscv64-developer-f40.ks b/fedora-riscv64-developer-f40.ks
index 47690ad..f77e0d8 100644
--- a/fedora-riscv64-developer-f40.ks
+++ b/fedora-riscv64-developer-f40.ks
@@ -44,8 +44,8 @@ grub2-efi-riscv64-modules
 efibootmgr
 
 # Add for sd-boot
-# systemd-boot-unsigned
-# edk2-ext4
+#systemd-boot-unsigned
+#edk2-ext4
 
 kernel
 kernel-core
diff --git a/fedora-riscv64-minimal-f40-experimental.ks b/fedora-riscv64-minimal-f40-experimental.ks
index a8e1731..6275824 100644
--- a/fedora-riscv64-minimal-f40-experimental.ks
+++ b/fedora-riscv64-minimal-f40-experimental.ks
@@ -42,7 +42,6 @@ poweroff
 -grub2-tools
 -grub2-efi-riscv64-cdboot
 -grub2-common
-
 efibootmgr
 
 # Add for sd-boot
diff --git a/fedora-riscv64-minimal-f40-kiwi.ks b/fedora-riscv64-minimal-f40-kiwi.ks
index ff58fba..4d8a64f 100644
--- a/fedora-riscv64-minimal-f40-kiwi.ks
+++ b/fedora-riscv64-minimal-f40-kiwi.ks
@@ -36,11 +36,11 @@ poweroff
 # GRUB2
 grub2-efi-riscv64
 grub2-efi-riscv64-modules
-# efibootmgr
+efibootmgr
 
 # Add for sd-boot
-systemd-boot-unsigned
-# edk2-ext4
+#systemd-boot-unsigned
+#edk2-ext4
 
 # python3-virt-firmware
 
diff --git a/fedora-riscv64-minimal-f40.ks b/fedora-riscv64-minimal-f40.ks
index 094a3de..4842985 100644
--- a/fedora-riscv64-minimal-f40.ks
+++ b/fedora-riscv64-minimal-f40.ks
@@ -36,9 +36,11 @@ poweroff
 # GRUB2
 grub2-efi-riscv64
 grub2-efi-riscv64-modules
+efibootmgr
 
 # Add for sd-boot
-systemd-boot-unsigned
+#systemd-boot-unsigned
+#edk2-ext4
 
 kernel
 kernel-core