diff --git a/templates/preseed.cfg.j2 b/templates/preseed.cfg.j2
index 24b514c..ddd512f 100644
--- a/templates/preseed.cfg.j2
+++ b/templates/preseed.cfg.j2
@@ -1,8 +1,8 @@
 #_preseed_V1
-#### Contents of the preconfiguration file (for bullseye)
+#### Contents of the preconfiguration file (for trixie)
 ### Localization
 # Preseeding only locale sets language, country and locale.
-d-i debian-installer/locale string en_US
+d-i debian-installer/locale string en_US.UTF-8
 
 # The values can also be preseeded individually for greater flexibility.
 d-i debian-installer/language string {{ debianunattended_debian_installer_language | default('de') }}
@@ -15,6 +15,15 @@ d-i debian-installer/locale string {{ debianunattended_debian_installer_locale
 d-i keyboard-configuration/xkb-keymap select {{ debianunattended_keyboard_configuration_xkb_keymap | default('de')  }}
 # d-i keyboard-configuration/toggle select No toggling
 
+### Speech synthesis
+# Which ALSA card to be used for software speech.
+# Can be a number from 0, or an ID as seen in
+# /sys/class/sound/card*/id
+#d-i espeakup/card string 0
+
+# Which espeak-ng voice to be used
+#d-i espeakup/voice string en
+
 ### Network configuration
 # Disable network configuration entirely. This is useful for cdrom
 # installations on non-networked devices where the network questions,
@@ -80,6 +89,10 @@ d-i netcfg/wireless_wep string
 # The wacky dhcp hostname that some ISPs use as a password of sorts.
 #d-i netcfg/dhcp_hostname string radish
 
+# If you want to completely disable firmware lookup (i.e. not use firmware
+# files or packages that might be available on installation images):
+#d-i hw-detect/firmware-lookup string never
+
 # If non-free firmware is needed for the network or other hardware, you can
 # configure the installer to always try to load it, without prompting. Or
 # change to false to disable asking.
@@ -171,7 +184,7 @@ d-i clock-setup/ntp-server string {{ debianunattended_ntpserver }}
 # - regular: use the usual partition types for your architecture
 # - lvm:     use LVM to partition the disk
 # - crypto:  use LVM within an encrypted partition
-d-i partman-auto/method string {{ debianunattended_partman_auto_method | default('regular') }}
+d-i partman-auto/method string {{ debianunattended_partman_auto_method | default('lvm') }}
 
 # You can define the amount of space that will be used for the LVM volume
 # group. It can either be a size with its unit (eg. 20 GB), a percentage of
@@ -188,10 +201,12 @@ d-i partman-md/device_remove_md boolean true
 d-i partman-lvm/confirm boolean true
 d-i partman-lvm/confirm_nooverwrite boolean true
 
-# You can choose one of the three predefined partitioning recipes:
+# You can choose one of the predefined partitioning recipes:
 # - atomic: all files in one partition
 # - home:   separate /home partition
 # - multi:  separate /home, /var, and /tmp partitions
+# - server: separate /var and /srv partitions; swap limitted to 1G
+# - small_disk: scheme dedicated to small harddrives (under 10GB)
 {% if debianunattended_partman_auto_expert_recipe is not defined %}
 d-i partman-auto/choose_recipe select atomic
 {% endif %}
@@ -248,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
@@ -260,11 +275,8 @@ d-i partman-partitioning/default_label string gpt
 # The method should be set to "raid".
 #d-i partman-auto/method string raid
 # Specify the disks to be partitioned. They will all get the same layout,
-# so this will only work if the disks are the same size.preseed
+# so this will only work if the disks are the same size.
 #d-i partman-auto/disk string /dev/sda /dev/sdb
-{% if debianunattended_partman_auto_disk is defined %}
-d-i partman-auto/disk string {{ debianunattended_partman_auto_disk }}
-{% endif %}
 
 # Next you need to specify the physical partitions that will be used. 
 {{ debianunattended_partman_auto_expert_recipe | default('') }}
@@ -310,8 +322,6 @@ d-i partman-partitioning/confirm_write_new_label boolean true
 d-i partman/choose_partition select finish
 d-i partman/confirm boolean true
 d-i partman/confirm_nooverwrite boolean true
-d-i partman/confirm_nochanges boolean true
-d-i partman-md/confirm_nooverwrite boolean true
 
 ## Controlling how partitions are mounted
 # The default is to mount by UUID, but you can also choose "traditional" to
@@ -333,6 +343,8 @@ d-i partman-md/confirm_nooverwrite boolean true
 # Choose, if you want to scan additional installation media
 # (default: false).
 d-i apt-setup/cdrom/set-first boolean false
+# You can choose to install non-free firmware.
+d-i apt-setup/non-free-firmware boolean true
 # You can choose to install non-free and contrib software.
 d-i apt-setup/non-free boolean true
 d-i apt-setup/contrib boolean true
@@ -340,7 +352,7 @@ d-i apt-setup/contrib boolean true
 # entry for a DVD/BD installation image active in the installed system
 # (entries for netinst or CD images will be disabled anyway, regardless of
 # this setting).
-d-i apt-setup/disable-cdrom-entries boolean true
+#d-i apt-setup/disable-cdrom-entries boolean true
 # Uncomment this if you don't want to use a network mirror.
 #d-i apt-setup/use_mirror boolean false
 # Select which update services to use; define the mirrors to be used.
@@ -358,10 +370,12 @@ d-i apt-setup/disable-cdrom-entries boolean true
 # apt will complain about the unauthenticated repository and so the
 # sources.list line will be left commented out.
 #d-i apt-setup/local0/key string http://local.server/key
-# If the provided key file ends in ".asc" the key file needs to be an
-# ASCII-armoured PGP key, if it ends in ".gpg" it needs to use the
-# "GPG key public keyring" format, the "keybox database" format is
-# currently not supported.
+# or one can provide it in-line by base64 encoding the contents of the
+# key file (with `base64 -w0`) and specifying it thus:
+#d-i apt-setup/local0/key string base64://LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCi4uLgo=
+# The content of the key file is checked to see if it appears to be ASCII-armoured.
+# If so it will be saved with an ".asc" extension, otherwise it gets a '.gpg' extension.
+# "keybox database" format is currently not supported. (see generators/60local in apt-setup's source)
 
 # By default the installer requires that repositories be authenticated
 # using a known gpg key. This setting can be used to disable that
@@ -389,7 +403,7 @@ d-i pkgsel/upgrade select full-upgrade
 # You can choose, if your system will report back on what software you have
 # installed, and what software you use. The default is not to report back,
 # but sending reports helps the project determine what software is most
-# popular and should be included on the first CD/DVD.
+# popular and should be included on the first DVD.
 popularity-contest popularity-contest/participate boolean false
 
 ### Boot loader installation
@@ -438,7 +452,7 @@ d-i grub-installer/bootdev  string {{ debianunattended_partman_auto_disk | defau
 # Avoid that last message about the install being complete.
 d-i finish-install/reboot_in_progress note
 
-# This will prevent the installer from ejecting the CD during the reboot,
+# This will prevent the installer from ejecting the disc during the reboot,
 # which is useful in some situations.
 #d-i cdrom-detect/eject boolean false
 
@@ -481,15 +495,6 @@ d-i finish-install/reboot_in_progress note
 # packages and run commands in the target system.
 d-i preseed/late_command string /cdrom/late_command.sh
 
-##added
-d-i apt-setup/cdrom/set-first boolean false
-d-i apt-setup/cdrom/set-next boolean false   
-d-i apt-setup/cdrom/set-failed boolean false
-apt-cdrom-setup	apt-setup/cdrom/set-next	boolean	false
-apt-cdrom-setup	apt-setup/cdrom/set-failed	boolean	true
-pkgsel/update-policy select none
-pkgsel/updatedb boolean true
-
 {% if debianunattended_staticip_ipaddress is defined %}
 #static IPv4 address?
 d-i netcfg/disable_autoconfig boolean true