diff --git a/dishes/desktop-hypervisor-amdcpu.cfg b/dishes/desktop-hypervisor-amdcpu.cfg
index 6cabb90..29ecb9a 100644
--- a/dishes/desktop-hypervisor-amdcpu.cfg
+++ b/dishes/desktop-hypervisor-amdcpu.cfg
@@ -29,7 +29,7 @@ url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$rele
 # X Window System configuration information
 xconfig  --defaultdesktop=GNOME --startxonboot
 # System bootloader configuration
-bootloader --location=mbr --timeout=1 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
diff --git a/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg b/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg
index 377a7a4..b8feed1 100644
--- a/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg
+++ b/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg
@@ -29,7 +29,7 @@ url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$rele
 # X Window System configuration information
 xconfig  --defaultdesktop=GNOME --startxonboot
 # System bootloader configuration
-bootloader --location=mbr --timeout=1 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
diff --git a/dishes/desktop-hypervisor-intelcpu.cfg b/dishes/desktop-hypervisor-intelcpu.cfg
index e11f0ba..ac31b27 100644
--- a/dishes/desktop-hypervisor-intelcpu.cfg
+++ b/dishes/desktop-hypervisor-intelcpu.cfg
@@ -29,7 +29,7 @@ url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$rele
 # X Window System configuration information
 xconfig  --defaultdesktop=GNOME --startxonboot
 # System bootloader configuration
-bootloader --location=mbr --timeout=1 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
diff --git a/dishes/desktop-hypervisor.cfg b/dishes/desktop-hypervisor.cfg
index 7619602..8683b13 100644
--- a/dishes/desktop-hypervisor.cfg
+++ b/dishes/desktop-hypervisor.cfg
@@ -29,7 +29,7 @@ url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$rele
 # X Window System configuration information
 xconfig  --defaultdesktop=GNOME --startxonboot
 # System bootloader configuration
-bootloader --location=mbr --timeout=1 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
diff --git a/dishes/desktop.cfg b/dishes/desktop.cfg
index 34dc9cd..a627182 100644
--- a/dishes/desktop.cfg
+++ b/dishes/desktop.cfg
@@ -29,7 +29,7 @@ url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$rele
 # X Window System configuration information
 xconfig  --defaultdesktop=GNOME --startxonboot
 # System bootloader configuration
-bootloader --location=mbr --timeout=1 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
diff --git a/dishes/live-desktop-hypervisor.cfg b/dishes/live-desktop-hypervisor.cfg
index 5a849c7..db7d800 100644
--- a/dishes/live-desktop-hypervisor.cfg
+++ b/dishes/live-desktop-hypervisor.cfg
@@ -27,7 +27,7 @@ url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$rele
 # X Window System configuration information
 xconfig  --defaultdesktop=GNOME --startxonboot
 # System bootloader configuration
-bootloader --location=none --timeout=1 --sdboot
+bootloader --location=none --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
diff --git a/dishes/live-desktop.cfg b/dishes/live-desktop.cfg
index 3fb1d6b..6f8138e 100644
--- a/dishes/live-desktop.cfg
+++ b/dishes/live-desktop.cfg
@@ -27,7 +27,7 @@ url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$rele
 # X Window System configuration information
 xconfig  --defaultdesktop=GNOME --startxonboot
 # System bootloader configuration
-bootloader --location=none --timeout=1 --sdboot
+bootloader --location=none --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
diff --git a/dishes/live-server-hypervisor.cfg b/dishes/live-server-hypervisor.cfg
index e50d731..2bf5ebb 100644
--- a/dishes/live-server-hypervisor.cfg
+++ b/dishes/live-server-hypervisor.cfg
@@ -25,7 +25,7 @@ timezone Europe/Paris --utc
 # Use network installation
 url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch"
 # System bootloader configuration
-bootloader --location=none --timeout=1 --sdboot
+bootloader --location=none --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
diff --git a/dishes/live-server.cfg b/dishes/live-server.cfg
index 5cc1bca..6363d64 100644
--- a/dishes/live-server.cfg
+++ b/dishes/live-server.cfg
@@ -25,7 +25,7 @@ timezone Europe/Paris --utc
 # Use network installation
 url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch"
 # System bootloader configuration
-bootloader --location=none --timeout=1 --sdboot
+bootloader --location=none --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
diff --git a/dishes/virtual-desktop-hypervisor.cfg b/dishes/virtual-desktop-hypervisor.cfg
index 9cd36c4..1d018f8 100644
--- a/dishes/virtual-desktop-hypervisor.cfg
+++ b/dishes/virtual-desktop-hypervisor.cfg
@@ -29,7 +29,7 @@ url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$rele
 # X Window System configuration information
 xconfig  --defaultdesktop=GNOME --startxonboot
 # System bootloader configuration
-bootloader --location=mbr --timeout=1 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
diff --git a/dishes/virtual-desktop.cfg b/dishes/virtual-desktop.cfg
index 98d36fb..8715614 100644
--- a/dishes/virtual-desktop.cfg
+++ b/dishes/virtual-desktop.cfg
@@ -29,7 +29,7 @@ url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$rele
 # X Window System configuration information
 xconfig  --defaultdesktop=GNOME --startxonboot
 # System bootloader configuration
-bootloader --location=mbr --timeout=1 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
diff --git a/dishes/virtual-nano.cfg b/dishes/virtual-nano.cfg
index 9d417c5..dee0453 100644
--- a/dishes/virtual-nano.cfg
+++ b/dishes/virtual-nano.cfg
@@ -27,7 +27,7 @@ timezone Europe/Paris --utc
 # Use network installation
 url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch"
 # System bootloader configuration
-bootloader --location=mbr --timeout=1 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
diff --git a/dishes/virtual-server-hypervisor.cfg b/dishes/virtual-server-hypervisor.cfg
index 04e815f..d596078 100644
--- a/dishes/virtual-server-hypervisor.cfg
+++ b/dishes/virtual-server-hypervisor.cfg
@@ -27,7 +27,7 @@ timezone Europe/Paris --utc
 # Use network installation
 url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch"
 # System bootloader configuration
-bootloader --location=mbr --timeout=1 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
diff --git a/dishes/virtual-server.cfg b/dishes/virtual-server.cfg
index 57f53e4..8faa3e5 100644
--- a/dishes/virtual-server.cfg
+++ b/dishes/virtual-server.cfg
@@ -27,7 +27,7 @@ timezone Europe/Paris --utc
 # Use network installation
 url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch"
 # System bootloader configuration
-bootloader --location=mbr --timeout=1 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
diff --git a/recipes/desktop-hypervisor-amdcpu.cfg b/recipes/desktop-hypervisor-amdcpu.cfg
index 0b627df..ec5ce71 100644
--- a/recipes/desktop-hypervisor-amdcpu.cfg
+++ b/recipes/desktop-hypervisor-amdcpu.cfg
@@ -9,7 +9,7 @@
 
 %include ../ingredients/core.cfg # Text mode for automated installation
 %include ../ingredients/core-storage.cfg # Storage configuration
-%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GRUB
 %include ../ingredients/core-locale.cfg # System locale
 %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
diff --git a/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg b/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg
index 97c88e7..78d8105 100644
--- a/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg
+++ b/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg
@@ -10,7 +10,7 @@
 
 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GRUB
 %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language
 %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
diff --git a/recipes/desktop-hypervisor-intelcpu.cfg b/recipes/desktop-hypervisor-intelcpu.cfg
index bc90a06..234676a 100644
--- a/recipes/desktop-hypervisor-intelcpu.cfg
+++ b/recipes/desktop-hypervisor-intelcpu.cfg
@@ -9,7 +9,7 @@
 
 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GRUB
 %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language
 %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
diff --git a/recipes/desktop-hypervisor.cfg b/recipes/desktop-hypervisor.cfg
index 5046826..85036fd 100644
--- a/recipes/desktop-hypervisor.cfg
+++ b/recipes/desktop-hypervisor.cfg
@@ -9,7 +9,7 @@
 
 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GRUB
 %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language
 %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
diff --git a/recipes/desktop.cfg b/recipes/desktop.cfg
index 7888dae..4265ab7 100644
--- a/recipes/desktop.cfg
+++ b/recipes/desktop.cfg
@@ -9,7 +9,7 @@
 
 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GRUB
 %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language
 %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
diff --git a/recipes/live-desktop-hypervisor.cfg b/recipes/live-desktop-hypervisor.cfg
index 4d1b79d..766a15a 100644
--- a/recipes/live-desktop-hypervisor.cfg
+++ b/recipes/live-desktop-hypervisor.cfg
@@ -9,7 +9,7 @@
 
 %include ../ingredients/live-core.cfg # For live systems only
 %include ../ingredients/live-core-storage.cfg # For live systems only
-%include ../ingredients/live-core-bootloader-systemd-boot.cfg #  # Set bootloader to systemd-boot
+%include ../ingredients/live-core-bootloader-grub.cfg # Set bootloader to GRUB
 %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language
 %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
diff --git a/recipes/live-desktop.cfg b/recipes/live-desktop.cfg
index 69a61a9..7bf1779 100644
--- a/recipes/live-desktop.cfg
+++ b/recipes/live-desktop.cfg
@@ -9,7 +9,7 @@
 
 %include ../ingredients/live-core.cfg # For live systems only
 %include ../ingredients/live-core-storage.cfg # For live systems only
-%include ../ingredients/live-core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%include ../ingredients/live-core-bootloader-grub.cfg # Set bootloader to GRUB
 %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language
 %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
diff --git a/recipes/live-server-hypervisor.cfg b/recipes/live-server-hypervisor.cfg
index 22fc68d..dc3e4a0 100644
--- a/recipes/live-server-hypervisor.cfg
+++ b/recipes/live-server-hypervisor.cfg
@@ -9,7 +9,7 @@
 
 %include ../ingredients/live-core.cfg # For live systems only
 %include ../ingredients/live-core-storage.cfg # For live systems only
-%include ../ingredients/live-core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%include ../ingredients/live-core-bootloader-grub.cfg # Set bootloader to GRUB
 %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language
 %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
diff --git a/recipes/live-server.cfg b/recipes/live-server.cfg
index 30ee5d4..9c40de3 100644
--- a/recipes/live-server.cfg
+++ b/recipes/live-server.cfg
@@ -9,7 +9,7 @@
 
 %include ../ingredients/live-core.cfg # For live systems only
 %include ../ingredients/live-core-storage.cfg # For live systems only
-%include ../ingredients/live-core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%include ../ingredients/live-core-bootloader-grub.cfg # Set bootloader to GRUB
 %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language
 %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
diff --git a/recipes/virtual-desktop-hypervisor.cfg b/recipes/virtual-desktop-hypervisor.cfg
index df5cde1..6c2bbce 100644
--- a/recipes/virtual-desktop-hypervisor.cfg
+++ b/recipes/virtual-desktop-hypervisor.cfg
@@ -9,7 +9,7 @@
 
 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GRUB
 %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language
 %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
diff --git a/recipes/virtual-desktop.cfg b/recipes/virtual-desktop.cfg
index 64d28f3..3766b1a 100644
--- a/recipes/virtual-desktop.cfg
+++ b/recipes/virtual-desktop.cfg
@@ -9,7 +9,7 @@
 
 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GRUB
 %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language
 %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
diff --git a/recipes/virtual-nano.cfg b/recipes/virtual-nano.cfg
index 0671e8d..7507187 100644
--- a/recipes/virtual-nano.cfg
+++ b/recipes/virtual-nano.cfg
@@ -9,7 +9,7 @@
 
 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GRUB
 %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language
 %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
diff --git a/recipes/virtual-server-hypervisor.cfg b/recipes/virtual-server-hypervisor.cfg
index cd4a302..9f7d9a6 100644
--- a/recipes/virtual-server-hypervisor.cfg
+++ b/recipes/virtual-server-hypervisor.cfg
@@ -9,7 +9,7 @@
 
 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GRUB
 %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language
 %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
diff --git a/recipes/virtual-server.cfg b/recipes/virtual-server.cfg
index 1f9b9e1..f320a86 100644
--- a/recipes/virtual-server.cfg
+++ b/recipes/virtual-server.cfg
@@ -9,7 +9,7 @@
 
 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GRUB
 %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language
 %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services