diff --git a/grub/EFI-BOOT-grub.cfg b/grub/EFI-BOOT-grub.cfg
index 3d2456b..ef25812 100644
--- a/grub/EFI-BOOT-grub.cfg
+++ b/grub/EFI-BOOT-grub.cfg
@@ -20,25 +20,18 @@ set timeout=10
 search --no-floppy --set=root -l 'Fedora-E-dvd-x86_64-44'
 
 ### BEGIN /etc/grub.d/10_linux ###
+menuentry 'Lokales UEFI-System booten' --class hdd --class os {
+    insmod part_gpt
+    insmod fat
+    insmod chain
+
+    search --no-floppy --file --set=local_efi /EFI/fedora/shimx64.efi
+
+    chainloader ($local_efi)/EFI/fedora/shimx64.efi
+    boot
+}
+
 menuentry 'Tuxflotte Provisioning - Fedora Workstation' --class fedora --class gnu-linux --class gnu --class os {
 	linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-E-dvd-x86_64-44 inst.ks=https://anode.tuxflotte.de/installers/fedora-workstation/ks.cfg ip=dhcp quiet
 	initrd /images/pxeboot/initrd.img
 }
-menuentry 'Install Fedora 44' --class fedora --class gnu-linux --class gnu --class os {
-	linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-E-dvd-x86_64-44 quiet
-	initrd /images/pxeboot/initrd.img
-}
-menuentry 'Test this media & install Fedora 44' --class fedora --class gnu-linux --class gnu --class os {
-	linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-E-dvd-x86_64-44 rd.live.check quiet
-	initrd /images/pxeboot/initrd.img
-}
-submenu 'Troubleshooting -->' {
-	menuentry 'Install Fedora 44 in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os {
-		linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-E-dvd-x86_64-44 nomodeset quiet
-		initrd /images/pxeboot/initrd.img
-	}
-	menuentry 'Rescue a Fedora system' --class fedora --class gnu-linux --class gnu --class os {
-		linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-E-dvd-x86_64-44 inst.rescue quiet
-		initrd /images/pxeboot/initrd.img
-	}
-}
diff --git a/grub/boot-grub2-grub.cfg b/grub/boot-grub2-grub.cfg
index 8836f9b..5a97002 100644
--- a/grub/boot-grub2-grub.cfg
+++ b/grub/boot-grub2-grub.cfg
@@ -17,31 +17,11 @@ set timeout=10
 search --no-floppy --set=root -l 'Fedora-E-dvd-x86_64-44'
 
 ### BEGIN /etc/grub.d/10_linux ###
+menuentry 'Von erster lokaler Festplatte booten' --class hdd --class os {
+    chainloader (hd0)+1
+}
+
 menuentry 'Tuxflotte Provisioning - Fedora Workstation' --class fedora --class gnu-linux --class gnu --class os {
 	linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-E-dvd-x86_64-44 inst.ks=https://anode.tuxflotte.de/installers/fedora-workstation/ks.cfg ip=dhcp quiet
 	initrd /images/pxeboot/initrd.img
 }
-menuentry 'Install Fedora 44' --class fedora --class gnu-linux --class gnu --class os {
-	linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-E-dvd-x86_64-44 quiet
-	initrd /images/pxeboot/initrd.img
-}
-menuentry 'Test this media & install Fedora 44' --class fedora --class gnu-linux --class gnu --class os {
-	linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-E-dvd-x86_64-44 rd.live.check quiet
-	initrd /images/pxeboot/initrd.img
-}
-submenu 'Troubleshooting -->' {
-	menuentry 'Install Fedora 44 in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os {
-		linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-E-dvd-x86_64-44 nomodeset quiet
-		initrd /images/pxeboot/initrd.img
-	}
-	menuentry 'Rescue a Fedora system' --class fedora --class gnu-linux --class gnu --class os {
-		linux /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=Fedora-E-dvd-x86_64-44 inst.rescue quiet
-		initrd /images/pxeboot/initrd.img
-	}
-	menuentry 'Boot first drive' --class fedora --class gnu-linux --class gnu --class os {
-		chainloader (hd0)+1
-	}
-	menuentry 'Boot second drive' --class fedora --class gnu-linux --class gnu --class os {
-		chainloader (hd1)+1
-	}
-}
diff --git a/scripts/build.sh b/scripts/build.sh
index 1fd81c4..f7d5dfa 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -85,7 +85,7 @@ verify_workdir() {
 create_iso() {
   echo "Creating Tuxflotte ISO..."
 
-  local output_iso="$OUTPUT_DIR/tuxflotte-provisioning-0.1.iso"
+  local output_iso="$OUTPUT_DIR/tuxflotte-provisioning-0.2.iso"
 
   rm -f "$output_iso"