diff --git a/docker/imap/rootfs/etc/imapd.conf b/docker/imap/rootfs/etc/imapd.conf
index 34f78884..b2439584 100644
--- a/docker/imap/rootfs/etc/imapd.conf
+++ b/docker/imap/rootfs/etc/imapd.conf
@@ -1,104 +1,104 @@
 servername: SERVERNAME
 configdirectory: /var/lib/imap
 defaultpartition: default
 metapartition_files: annotations cache expunge header index
 partition-default: /var/spool/imap/
 metapartition-default: /var/spool/imap/
 sievedir: /var/lib/imap/sieve
 annotation_definitions: /etc/imapd.annotations.conf
 
-autocreate_quota: 5242880
-autocreate_inbox_folders: Drafts | Trash | Sent
-autocreate_subscribe_folders: Drafts | Trash | Sent
+# ROLE_BACKEND utocreate_quota: 5242880
+# ROLE_BACKEND utocreate_inbox_folders: Drafts | Trash | Sent
+# ROLE_BACKEND utocreate_subscribe_folders: Drafts | Trash | Sent
 # Set specialuse flags
-xlist-drafts: Drafts
-xlist-sent: Sent
-xlist-trash: Trash
-#
+# ROLE_BACKEND list-drafts: Drafts
+# ROLE_BACKEND list-sent: Sent
+# ROLE_BACKEND list-trash: Trash
+
 # WITH_TLS tls_server_cert: /etc/pki/cyrus-imapd/cyrus-imapd.bundle.pem
 # WITH_TLS tls_server_key: /etc/pki/cyrus-imapd/cyrus-imapd.bundle.pem
 # WITH_TLS tls_server_ca_file: TLS_SERVER_CA_FILE
 # WITH_TLS 
 # WITH_TLS tls_client_certs: off
 # WITH_TLS tls_ciphers: kEECDH:+kEECDH+SHA:kEDH:+kEDH+SHA:kECDH:+kECDH+SHA:kRSA:+kRSA+SHA:!aNULL:!eNULL:!SSLv2:!RC4:!MD5:!DES:!EXP:!SEED:!IDEA:!3DES
 # WITH_TLS tls_prefer_server_ciphers: 1
 # WITH_TLS sieve_tls_versions: tls1_0 tls1_1 tls1_2
 # WITH_TLS tls_versions: tls1_3
 
 idlesocket: /var/lib/imap/socket/idle
 disable_shared_namespace: 0
 disable_user_namespace: 0
 duplicate_db_path: /run/cyrus/db/deliver.db
 mboxname_lockpath: /run/cyrus/lock
 proc_path: /run/cyrus/proc
 # Apparently does not work
 ##ptscache_db_path: /var/tmp/cyrus-imapd/ptscache.db
 statuscache_db_path: /run/cyrus/db/statuscache.db
 temp_path: /tmp
 tls_sessions_db_path: /run/cyrus/db/tls_sessions.db
 
 sendmail: /usr/sbin/sendmail
 admins: IMAP_ADMIN_LOGIN
 sasl_pwcheck_method: saslauthd
 sasl_mech_list: PLAIN LOGIN
 sasl_saslauthd_path: /run/saslauthd/mux
 allowplaintext: yes
 
 lmtp_over_quota_perm_failure: 1
 
 maxlogins_per_user: MAXLOGINS_PER_USER
 # Disable mailbox referrals for all clients, as the referrals will point
 # addresses the client cannot reach.
 proxyd_disable_mailbox_referrals: 0
 
 
-httpmodules: caldav carddav domainkey freebusy ischedule rss webdav prometheus
+# ROLE_BACKEND httpmodules: caldav carddav domainkey freebusy ischedule rss webdav prometheus
 
 caldav_allowcalendaradmin: 1
 
 unixhierarchysep: 1
 virtdomains: userid
 sieve_extensions: fileinto reject envelope body vacation imap4flags include regex subaddress relational copy date
 allowallsubscribe: 0
 anyoneuseracl: 0
 allowusermoves: 1
 altnamespace: 1
 disconnect_on_vanished_mailbox: 1
 hashimapspool: 1
 anysievefolder: 1
 fulldirhash: 0
 sieve_maxscripts: 150
 sieve_maxscriptsize: 128
 sieveusehomedir: 0
 sieve_allowreferrals: 0
 sieve_utf8fileinto: 1
 lmtp_downcase_rcpt: 1
 lmtp_fuzzy_mailbox_match: 1
 username_tolower: 1
 deletedprefix: DELETED
 delete_mode: delayed
 expunge_mode: delayed
 postuser: shared
 tcp_keepalive: 1
 prometheus_enabled: 1
 
 syslog_prefix: cyrus-imapd
 
-calendar_default_displayname: Calendar
-addressbook_default_displayname: Addressbook
+# ROLE_BACKEND calendar_default_displayname: Calendar
+# ROLE_BACKEND addressbook_default_displayname: Addressbook
 
 debug: 0
 chatty: 1
 
 # proxy authentication for these users
 # ROLE_BACKEND proxyservers: IMAP_ADMIN_LOGIN
 
 # WITH_MUPDATE mupdate_server: MUPDATE
 # WITH_MUPDATE mupdate_port: 3905
 # WITH_MUPDATE mupdate_authname: IMAP_ADMIN_LOGIN
 # WITH_MUPDATE mupdate_username: IMAP_ADMIN_LOGIN
 # WITH_MUPDATE mupdate_password: IMAP_ADMIN_PASSWORD
 #
 # ROLE_FRONTEND # proxy authentication against backends
 # ROLE_FRONTEND proxy_authname: IMAP_ADMIN_LOGIN
 # ROLE_FRONTEND proxy_password: IMAP_ADMIN_PASSWORD