diff --git a/etc/calamares/modules/bootloader.conf b/etc/calamares/modules/bootloader.conf
index cedcc7c..1ac9c9b 100644
--- a/etc/calamares/modules/bootloader.conf
+++ b/etc/calamares/modules/bootloader.conf
@@ -1,5 +1,5 @@
 # Possible options are 'grub', 'sb-shim' and 'systemd-boot'.
-efiBootLoader: "systemd-boot"
+efiBootLoader: "grub"
 
 kernelSearchPath: "/usr/lib/modules"
 #kernelName: "vmlinuz"
@@ -21,4 +21,4 @@ installEFIFallback: false
 loaderEntries:
   - "timeout 5"
   - "console-mode auto"
-  - "reboot-for-bitlocker 1"
\ No newline at end of file
+  - "reboot-for-bitlocker 1"
diff --git a/etc/calamares/modules/packagechooserq.conf b/etc/calamares/modules/packagechooserq.conf
deleted file mode 100644
index 6532171..0000000
--- a/etc/calamares/modules/packagechooserq.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
-# Configuration for the low-density software chooser, QML implementation
-#
-# The example QML implementation uses single-selection, rather than
-# a model for the available packages. That makes it simpler: the
-# QML itself codes the available options, descriptions and images
-# -- after all, this is **low density** selection, so a custom UI
-# can make sense for the few choices that need to be made.
-#
-#
-
----
-
-method: legacy
-
-labels:
-    step: "Bootloader"
-    step[de]: "Bootloader"
-    step[fi]: "Käynnistyksenlataaja"
-    step[fr]: "Chargeur"
-    step[it]: "Caricatore"
-    step[sp]: "Cargador"
-    step[ru]: "Загрузчик"
-    step[zh_CN]: "引导程序"
-    step[ja]: "ブートローダー"
-    step[sv]: "Uppstartshanterare"
-    step[pt_BR]: "Bootloader"
-    step[tr]: "Önyükleyici"
-    step[ro]: "Manager de pornire"
-    step[ko]: "부트로더"
-    step[fa]: "بوت‌لودر"
-
-packageChoice: systemd-boot
-
diff --git a/etc/calamares/modules/windowsbootentry.conf b/etc/calamares/modules/windowsbootentry.conf
deleted file mode 100644
index 46896b7..0000000
--- a/etc/calamares/modules/windowsbootentry.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
-# The windowsbootentry module creates a manual entry for Windows
----
-# A variable from global storage which contains the bootloader selected
-bootLoaderVar: "packagechooser_packagechooserq"
diff --git a/etc/calamares/settings.conf b/etc/calamares/settings.conf
index ea6ec29..0a1935b 100644
--- a/etc/calamares/settings.conf
+++ b/etc/calamares/settings.conf
@@ -22,7 +22,6 @@ sequence:
   - welcome
   - locale
   - keyboard
-  - packagechooserq
   - partition
   - summary
 - exec:
@@ -47,7 +46,6 @@ sequence:
   - services-systemd
   - packages
   - grubcfg
-  - windowsbootentry
   - bootloader
   - shellprocess@remove-livecd
   - umount