diff --git a/templates/preseed.cfg.j2 b/templates/preseed.cfg.j2
index 277ee8a..ba1c966 100644
--- a/templates/preseed.cfg.j2
+++ b/templates/preseed.cfg.j2
@@ -263,10 +263,10 @@ d-i partman/confirm boolean true
 d-i partman/confirm_nooverwrite boolean true
 
 # Force UEFI booting ('BIOS compatibility' will be lost). Default: false.
-d-i partman-efi/non_efi_system boolean true
+#d-i partman-efi/non_efi_system boolean true
 # Ensure the partition table is GPT - this is required for EFI
-d-i partman-partitioning/choose_label select gpt
-d-i partman-partitioning/default_label string gpt
+#d-i partman-partitioning/choose_label select gpt
+#d-i partman-partitioning/default_label string gpt
 
 # When disk encryption is enabled, skip wiping the partitions beforehand.
 #d-i partman-auto-crypto/erase_disks boolean false