diff --git a/defaults/main.yml b/defaults/main.yml
index 03bc94d..2effde6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -113,6 +113,7 @@ schleuder_bounces_drop_all: "false"
 schleuder_bounces_drop_on_headers:
   x-spam-flag: "yes"
 schleuder_bounces_notify_admins: "true"
+schleuder_include_autocrypt_header: "true"
 schleuder_include_list_headers: "true"
 schleuder_include_openpgp_header: "true"
 schleuder_openpgp_header_preference: signencrypt
@@ -122,6 +123,9 @@ schleuder_logfiles_to_keep: 2
 # Available: en, de.
 schleuder_language: en
 schleuder_forward_all_incoming_to_admins: "false"
+schleuder_deliver_selfsent: "true"
+schleuder_set_reply_to_to_sender: "false"
+schleuder_munge_from: "false"
 
 ### schleuder-web/database.yml
 # schleuder-web uses it's own database to store user credentials
@@ -138,7 +142,7 @@ schleuder_web_mailer_from: noreply@example.org
 schleuder_web_superadmins:
   - "{{ schleuder_superadmin }}"
 
-schleuder_web_version: "{{ 'debian/buster/3.4.0' if ansible_distribution_release == 'buster' else 'debian/bullseye/3.6.0' }}"
+schleuder_web_version: "{{ 'debian/bullseye/3.6.0' if ansible_distribution_release == 'bullseye' else 'debian/bookworm/4.0.0' }}"
 
 schleuder_schleuder_web_api_host: "{{ schleuder_api.host }}"
 schleuder_schleuder_web_api_port: "{{ schleuder_api.port }}"
diff --git a/templates/schleuder/list-defaults.yml.j2 b/templates/schleuder/list-defaults.yml.j2
index f6fe8d6..0f2d5c8 100644
--- a/templates/schleuder/list-defaults.yml.j2
+++ b/templates/schleuder/list-defaults.yml.j2
@@ -94,6 +94,9 @@ bounces_drop_on_headers:
 # Send a notice to the list-admins whenever an email is bounced or dropped?
 bounces_notify_admins: {{ schleuder_bounces_notify_admins }}
 
+# Include Autocrypt header into emails?
+include_autocrypt_header: {{ schleuder_include_autocrypt_header }}
+
 # Include RFC-compliant List-* Headers into emails?
 include_list_headers: {{ schleuder_include_list_headers}}
 
@@ -124,3 +127,26 @@ language: {{ schleuder_language }}
 # Forward a raw copy of all incoming emails to the list-admins?
 # Mainly useful for debugging.
 forward_all_incoming_to_admins: {{ schleuder_forward_all_incoming_to_admins }}
+
+# Should e-mails be delivered to the original subscribed sender?
+# Disabling this only works for signed e-mails; any e-mail that is unsigned
+# sent to the list is treated as coming from an unknown source
+deliver_selfsent: {{ schleuder_deliver_selfsent }}
+
+# Set reply-to header to original sender's reply-to? 
+# Enabling this will set the reply-to-header of emails sent by schleuder
+# to the original sender's reply-to-header. If the original sender
+# did not supply a reply-to-header, the original from-header will be used.
+# This option can enabled for improved usability since this affect
+# mail client's reply-to button to reply to the original sender instead of
+# the whole list.
+set_reply_to_to_sender: {{ schleuder_set_reply_to_to_sender }}
+
+# Munge from-header?
+# Enabling this option will add the original sender to the from-header.
+# To avoid DMARC issues, we still use the list's address as from-address.
+# However the sender's address will be included as displayed name.
+# For example: "sender@sender.org via list@list.org" <list@list.org>
+# This option can enabled for improved usability since this affect
+# mail client's displayed name.
+munge_from: {{ schleuder_munge_from }}