diff --git a/config.demo/docker-compose.override.yml b/config.demo/docker-compose.override.yml
index d31d5ce1..57d2728f 100644
--- a/config.demo/docker-compose.override.yml
+++ b/config.demo/docker-compose.override.yml
@@ -1,198 +1,200 @@
 version: '3'
 services:
   roundcube:
     environment:
       - MAIL_HOST=postfix
       - MAIL_PORT=10587
   proxy:
     depends_on:
       imap:
         condition: service_healthy
       postfix:
         condition: service_healthy
       webapp:
         condition: service_healthy
     build:
       context: ./docker/proxy/
     healthcheck:
       interval: 10s
       test: "kill -0 $$(cat /run/nginx.pid)"
       timeout: 5s
       retries: 30
     environment:
       - APP_WEBSITE_DOMAIN=${APP_WEBSITE_DOMAIN:?err}
       - SSL_CERTIFICATE=${PROXY_SSL_CERTIFICATE:?err}
       - SSL_CERTIFICATE_KEY=${PROXY_SSL_CERTIFICATE_KEY:?err}
     container_name: kolab-proxy
     restart: on-failure
     hostname: proxy
     image: kolab-proxy
     extra_hosts:
       - "meet:${MEET_LISTENING_HOST}"
     networks:
       kolab:
         ipv4_address: 172.18.0.7
     tmpfs:
       - /run
       - /tmp
       - /var/run
       - /var/tmp
     tty: true
     volumes:
       - ./docker/certs/:/etc/certs/:ro
       - /etc/letsencrypt/:/etc/letsencrypt/:ro
     ports:
       # - "25:25"
       # - "80:80"
       - "443:443"
       - "465:465"
       - "587:587"
       - "143:143"
       - "993:993"
   imap:
     build:
       context: ./docker/imap/
     environment:
       - APP_DOMAIN=${APP_DOMAIN}
       - SERVICES_PORT=8000
       - IMAP_ADMIN_LOGIN=${IMAP_ADMIN_LOGIN}
       - IMAP_ADMIN_PASSWORD=${IMAP_ADMIN_PASSWORD}
       - SSL_CERTIFICATE=${KOLAB_SSL_CERTIFICATE:?"KOLAB_SSL_CERTIFICATE is missing"}
       - SSL_CERTIFICATE_FULLCHAIN=${KOLAB_SSL_CERTIFICATE_FULLCHAIN:?"KOLAB_SSL_CERTIFICATE_FULLCHAIN is missing"}
       - SSL_CERTIFICATE_KEY=${KOLAB_SSL_CERTIFICATE_KEY:?"KOLAB_SSL_CERTIFICATE_KEY is missing"}
     healthcheck:
       interval: 10s
       test: "kill -0 1"
       timeout: 5s
       retries: 30
     container_name: kolab-imap
     restart: on-failure
     hostname: imap
     image: kolab-imap
     networks:
       kolab:
         ipv4_address: 172.18.0.12
     extra_hosts:
       - "kolab.mgmt.com:127.0.0.1"
       - "services.${APP_DOMAIN}:172.18.0.4"
     tmpfs:
       - /run
       - /tmp
       - /var/run
       - /var/tmp
     tty: true
     volumes:
       - ./docker/certs/:/etc/certs/:ro
       - /etc/letsencrypt/:/etc/letsencrypt/:ro
       - imap-spool:/var/spool/imap
       - imap-lib:/var/lib/imap
     ports:
       - "11080:11080"
       - "11143:11143"
       - "11024:11024"
   postfix:
     build:
       context: ./docker/postfix/
     healthcheck:
       interval: 10s
       test: "kill -0 1"
       timeout: 5s
       retries: 30
     environment:
       - APP_DOMAIN=${APP_DOMAIN}
       - SERVICES_PORT=8000
       - DB_HOST=mariadb
       - DB_USERNAME=${DB_USERNAME}
       - DB_PASSWORD=${DB_PASSWORD}
       - DB_DATABASE=${DB_DATABASE}
       - LMTP_DESTINATION=imap:11024
       - SSL_CERTIFICATE=${KOLAB_SSL_CERTIFICATE:?"KOLAB_SSL_CERTIFICATE is missing"}
       - SSL_CERTIFICATE_FULLCHAIN=${KOLAB_SSL_CERTIFICATE_FULLCHAIN:?"KOLAB_SSL_CERTIFICATE_FULLCHAIN is missing"}
       - SSL_CERTIFICATE_KEY=${KOLAB_SSL_CERTIFICATE_KEY:?"KOLAB_SSL_CERTIFICATE_KEY is missing"}
     container_name: kolab-postfix
     restart: on-failure
     hostname: postfix
     image: kolab-postfix
     networks:
       kolab:
         ipv4_address: 172.18.0.13
     extra_hosts:
       - "kolab.mgmt.com:127.0.0.1"
       - "services.${APP_DOMAIN}:172.18.0.4"
     tmpfs:
       - /run
       - /tmp
       - /var/run
       - /var/tmp
     tty: true
     volumes:
       - ./docker/certs/:/etc/certs/:ro
       - /etc/letsencrypt/:/etc/letsencrypt/:ro
       - postfix-spool:/var/spool/postfix
       - postfix-lib:/var/lib/postfix
     ports:
       - "10587:10587"
       - "10025:10025"
   amavis:
     build:
       context: ./docker/amavis/
     # healthcheck:
     #   interval: 10s
     #   test: "$(echo | nc 127.0.0.1 10024) | grep "220""
     #   timeout: 5s
     #   retries: 30
     environment:
       - APP_DOMAIN=${APP_DOMAIN}
       - DB_HOST=mariadb
       - DB_USERNAME=${DB_USERNAME}
       - DB_PASSWORD=${DB_PASSWORD}
       - DB_DATABASE=${DB_DATABASE}
     container_name: kolab-amavis
     restart: on-failure
     hostname: amavis
     image: kolab-amavis
     networks:
       kolab:
         ipv4_address: 172.18.0.15
     tmpfs:
       - /run
       - /tmp
       - /var/run
       - /var/tmp
     tty: true
     #Volumes for clamav and spamassassin?
     # volumes:
     #   - postfix-spool:/var/spool/postfix
     #   - postfix-lib:/var/lib/postfix
     ports:
       - "13024:13024"
   collabora:
     build:
       context: ./docker/collabora/
       args:
         REPOSITORY: "https://www.collaboraoffice.com/repos/CollaboraOnline/23.05/customer-rpm-Kolab-7537e68e8a07cf290a8c6cfcf4205db05b560582/"
     # healthcheck:
     #   interval: 10s
     #   test: "$(echo | nc 127.0.0.1 10024) | grep "220""
     #   timeout: 5s
     #   retries: 30
     container_name: kolab-collabora
     restart: on-failure
     hostname: collabora
     image: kolab-collabora
+    environment:
+      - ALLOWED_HOSTS=${APP_DOMAIN}
     networks:
       kolab:
         ipv4_address: 172.18.0.17
     tmpfs:
       - /run
       - /tmp
       - /var/run
       - /var/tmp
     tty: true
     # ports:
     #   - "13024:13024"
 volumes:
   postfix-spool:
   postfix-lib:
   imap-spool:
   imap-lib:
diff --git a/docker/collabora/Dockerfile b/docker/collabora/Dockerfile
index d2389fa7..7ecf369d 100644
--- a/docker/collabora/Dockerfile
+++ b/docker/collabora/Dockerfile
@@ -1,67 +1,70 @@
 FROM almalinux:8
 
 LABEL maintainer="contact@apheleia-it.ch"
 LABEL dist=centos8
 LABEL tier=${TIER}
 
 ENV DISTRO=centos8
 ENV LANG=en_US.utf8
 ENV LC_ALL=en_US.utf8
 
 # Add EPEL.
 RUN dnf -y install dnf-plugin-config-manager && \
     dnf config-manager --set-enabled powertools && \
     dnf -y install epel-release && \
     dnf -y install iputils vim-enhanced bind-utils && \
     dnf clean all
 RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 
 ARG REPOSITORY
 
 RUN id cool || (groupadd -g 1001 cool && useradd -d /opt/cool/ -u 1001 -g 1001 cool)
 
 RUN rpm --import "$REPOSITORY/repodata/repomd.xml.key" && \
     dnf config-manager --add-repo "$REPOSITORY" && \
     dnf -y --setopt tsflags= install \
     openssl \
     xmlstarlet \
     collabora-online-brand \
     coolwsd \
     collaboraoffice-dict-de \
     collaboraofficebasis-de \
     collaboraoffice-dict-en \
     collaboraofficebasis-en-GB \
     collaboraoffice-dict-es \
     collaboraofficebasis-es \
     collaboraoffice-dict-fr \
     collaboraofficebasis-fr \
     collaboraoffice-dict-it \
     collaboraofficebasis-it \
     collaboraoffice-dict-nl \
     collaboraofficebasis-nl \
     collaboraoffice-dict-pt-BR \
     collaboraofficebasis-pt-BR \
     collaboraoffice-dict-pt-PT \
     collaboraofficebasis-pt \
     collaboraoffice-dict-ru \
     collaboraofficebasis-ru && \
     dnf clean all
 
 RUN sed -i -r -e 's/^SELINUX=.*$/SELINUX=permissive/g' /etc/selinux/config 2>/dev/null || :
 
 RUN setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit && \
     setcap cap_sys_admin=ep /usr/bin/coolmount
 
 WORKDIR /opt/cool/
 
 ADD init.sh /init.sh
 ADD coolwsd.xml /etc/coolwsd/coolwsd.xml
 
 RUN chown -R 1001:0 /etc/coolwsd /opt/ && \
     chmod -R g=u /etc/coolwsd /opt/
 
 USER 1001
 
+#Space separated list of hosts (where the service is running)
+ENV ALLOWED_HOSTS="\.\*"
+
 CMD ["/init.sh"]
 
 EXPOSE 9980
diff --git a/docker/collabora/coolwsd.xml b/docker/collabora/coolwsd.xml
index 69e766fc..a9565395 100644
--- a/docker/collabora/coolwsd.xml
+++ b/docker/collabora/coolwsd.xml
@@ -1,303 +1,301 @@
 <?xml version="1.0"?>
 <!-- -*- nxml-child-indent: 4; tab-width: 4; indent-tabs-mode: nil -*- -->
 <config>
   <!-- For more detailed documentation on typical configuration options please see:
          https://sdk.collaboraonline.com/docs/installation/Configuration.html -->
   <!-- Note: 'default' attributes are used to document a setting's default value as well as to use as fallback. -->
   <!-- Note: When adding a new entry, a default must be set in WSD in case the entry is missing upon deployment. -->
   <accessibility desc="Accessibility settings">
     <enable type="bool" desc="Controls whether accessibility support should be enabled or not." default="false">false</enable>
   </accessibility>
   <allowed_languages desc="List of supported languages of Writing Aids (spell checker, grammar checker, thesaurus, hyphenation) on this instance. Allowing too many has negative effect on startup performance." default="de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru">de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru</allowed_languages>
   <!--
         These are the settings of external (remote) spellchecker and grammar checker services. Currently LanguageTool and Duden Korrekturserver APIs are supported, you can
         set either of them. By default they are disabled. To turn the support on, please set "enabled" property to true. It works with self hosted or cloud services, free
         and premium as well. The "base_url" may be https://api.languagetoolplus.com/v2 if the cloud version of LanguageTool is used. Please note that your data in the
         document e.g. the text part of it will be sent to the cloud API. Please read the respective privacy policies, e.g. https://languagetool.org/legal/privacy.
     -->
   <languagetool desc="Remote API settings for spell and grammar checking">
     <enabled desc="Enable Remote Spell and Grammar Checker" type="bool" default="false"/>
     <base_url desc="HTTP endpoint for the API server, without /check or /languages postfix at the end." type="string" default=""/>
     <user_name desc="LanguageTool or Duden account username for premium usage." type="string" default=""/>
     <api_key desc="API key provided by LanguageTool or Duden account for premium usage." type="string" default=""/>
     <ssl_verification desc="Enable or disable SSL verification. You may have to disable it in test environments with self-signed certificates." type="string" default="true"/>
     <rest_protocol desc="REST API protocol. For LanguageTool leave it blank, for Duden Korrekturserver use the string 'duden'." type="string" default=""/>
   </languagetool>
   <deepl desc="DeepL API settings for translation service">
     <enabled desc="If true, shows translate option as a menu entry in the compact view and as an icon in the tabbed view." type="bool" default="false">false</enabled>
     <api_url desc="URL for the API" type="string" default=""/>
     <auth_key desc="Auth Key generated by your account" type="string" default=""/>
   </deepl>
   <sys_template_path desc="Path to a template tree with shared libraries etc to be used as source for chroot jails for child processes." type="path" relative="true" default="systemplate"/>
   <child_root_path desc="Path to the directory under which the chroot jails for the child processes will be created. Should be on the same file system as systemplate and lotemplate. Must be an empty directory." type="path" relative="true" default="jails"/>
   <mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"/>
   <server_name desc="External hostname:port of the server running coolwsd. If empty, it's derived from the request (please set it if this doesn't work). May be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default=""/>
   <file_server_root_path desc="Path to the directory that should be considered root for the file server. This should be the directory containing cool." type="path" relative="true" default="browser/../"/>
   <hexify_embedded_urls desc="Enable to protect encoded URLs from getting decoded by intermediate hops. Particularly useful on Azure deployments" type="bool" default="false"/>
   <experimental_features desc="Enable/Disable experimental features" type="bool" default="false">false</experimental_features>
   <memproportion desc="The maximum percentage of system memory consumed by all of the Collabora Online, after which we start cleaning up idle documents" type="double" default="80.0"/>
   <num_prespawn_children desc="Number of child processes to keep started in advance and waiting for new clients." type="uint" default="1">1</num_prespawn_children>
   <!-- <fetch_update_check desc="Every number of hours will fetch latest version data. Defaults to 10 hours." type="uint" default="10">10</fetch_update_check> -->
   <per_document desc="Document-specific settings, including LO Core settings.">
     <max_concurrency desc="The maximum number of threads to use while processing a document." type="uint" default="4">4</max_concurrency>
     <batch_priority desc="A (lower) priority for use by batch eg. convert-to processes to avoid starving interactive ones" type="uint" default="5">5</batch_priority>
     <redlining_as_comments desc="If true show red-lines as comments" type="bool" default="false">false</redlining_as_comments>
     <pdf_resolution_dpi desc="The resolution, in DPI, used to render PDF documents as image. Memory consumption grows proportionally. Must be a positive value less than 385. Defaults to 96." type="uint" default="96">96</pdf_resolution_dpi>
     <idle_timeout_secs desc="The maximum number of seconds before unloading an idle document. Defaults to 1 hour." type="uint" default="3600">3600</idle_timeout_secs>
     <idlesave_duration_secs desc="The number of idle seconds after which document, if modified, should be saved. Disabled when 0. Defaults to 30 seconds." type="uint" default="30">30</idlesave_duration_secs>
     <autosave_duration_secs desc="The number of seconds after which document, if modified, should be saved. Disabled when 0. Defaults to 5 minutes." type="uint" default="300">300</autosave_duration_secs>
     <always_save_on_exit desc="On exiting the last editor, always perform the save, even if the document is not modified." type="bool" default="false">false</always_save_on_exit>
     <limit_virt_mem_mb desc="The maximum virtual memory allowed to each document process. 0 for unlimited." type="uint">0</limit_virt_mem_mb>
     <limit_stack_mem_kb desc="The maximum stack size allowed to each document process. 0 for unlimited." type="uint">8000</limit_stack_mem_kb>
     <limit_file_size_mb desc="The maximum file size allowed to each document process to write. 0 for unlimited." type="uint">0</limit_file_size_mb>
     <limit_num_open_files desc="The maximum number of files allowed to each document process to open. 0 for unlimited." type="uint">0</limit_num_open_files>
     <limit_load_secs desc="Maximum number of seconds to wait for a document load to succeed. 0 for unlimited." type="uint" default="100">100</limit_load_secs>
     <limit_store_failures desc="Maximum number of consecutive save-and-upload to storage failures when unloading the document. 0 for unlimited (not recommended)." type="uint" default="5">5</limit_store_failures>
     <limit_convert_secs desc="Maximum number of seconds to wait for a document conversion to succeed. 0 for unlimited." type="uint" default="100">100</limit_convert_secs>
     <min_time_between_saves_ms desc="Minimum number of milliseconds between saving the document on disk." type="uint" default="500">500</min_time_between_saves_ms>
     <min_time_between_uploads_ms desc="Minimum number of milliseconds between uploading the document to storage." type="uint" default="5000">5000</min_time_between_uploads_ms>
     <cleanup desc="Checks for resource consuming (bad) documents and kills associated kit process. A document is considered resource consuming (bad) if is in idle state for idle_time_secs period and memory usage passed limit_dirty_mem_mb or CPU usage passed limit_cpu_per" enable="true">
       <cleanup_interval_ms desc="Interval between two checks" type="uint" default="10000">10000</cleanup_interval_ms>
       <bad_behavior_period_secs desc="Minimum time period for a document to be in bad state before associated kit process is killed. If in this period the condition for bad document is not met once then this period is reset" type="uint" default="60">60</bad_behavior_period_secs>
       <idle_time_secs desc="Minimum idle time for a document to be candidate for bad state" type="uint" default="300">300</idle_time_secs>
       <limit_dirty_mem_mb desc="Minimum memory usage for a document to be candidate for bad state" type="uint" default="3072">3072</limit_dirty_mem_mb>
       <limit_cpu_per desc="Minimum CPU usage for a document to be candidate for bad state" type="uint" default="85">85</limit_cpu_per>
       <lost_kit_grace_period_secs desc="The minimum grace period for a lost kit process (not referenced by coolwsd) to resolve its lost status before it is terminated. To disable the cleanup of lost kits use value 0" default="120">120</lost_kit_grace_period_secs>
     </cleanup>
   </per_document>
   <per_view desc="View-specific settings.">
     <group_download_as desc="If set to true, groups download as icons into a dropdown for the notebookbar view." type="bool" default="true">true</group_download_as>
     <out_of_focus_timeout_secs desc="The maximum number of seconds before dimming and stopping updates when the browser tab is no longer in focus. Defaults to 120 seconds." type="uint" default="120">120</out_of_focus_timeout_secs>
     <idle_timeout_secs desc="The maximum number of seconds before dimming and stopping updates when the user is no longer active (even if the browser is in focus). Defaults to 15 minutes." type="uint" default="900">900</idle_timeout_secs>
   </per_view>
   <ver_suffix desc="Appended to etags to allow easy refresh of changed files during development" type="string" default=""/>
   <logging>
     <color type="bool">true</color>
     <!--
              Note to developers: When you do "make run", the logging.level will be set on the
              coolwsd command line, so if you want to change it for your testing, do it in
              Makefile.am, not here.
         -->
     <level type="string" desc="Can be 0-8 (with the lowest numbers being the least verbose), or none (turns off logging), fatal, critical, error, warning, notice, information, debug, trace" default="warning">warning</level>
     <level_startup type="string" desc="As for level - but for the initial startup phase which is most problematic, logging reverts to level configured above when startup is complete" default="trace">trace</level_startup>
     <most_verbose_level_settable_from_client type="string" desc="A loggingleveloverride message from the client can not set a more verbose log level than this" default="notice">notice</most_verbose_level_settable_from_client>
     <least_verbose_level_settable_from_client type="string" desc="A loggingleveloverride message from a client can not set a less verbose log level than this" default="fatal">fatal</least_verbose_level_settable_from_client>
     <protocol type="bool" desc="Enable minimal client-site JS protocol logging from the start">false</protocol>
     <!-- lokit_sal_log example: Log WebDAV-related messages, that is interesting for debugging Insert - Image operation: "+TIMESTAMP+INFO.ucb.ucp.webdav+WARN.ucb.ucp.webdav"
              See also: https://docs.libreoffice.org/sal/html/sal_log.html -->
     <lokit_sal_log type="string" desc="Fine tune log messages from LOKit. Default is to suppress log messages from LOKit." default="-INFO-WARN">-INFO-WARN</lokit_sal_log>
     <file enable="false">
       <!-- If you use other path than /var/log and you run coolwsd from systemd, make sure that you enable that path in coolwsd.service (ReadWritePaths). -->
       <property name="path" desc="Log file path.">/var/log/coolwsd.log</property>
       <property name="rotation" desc="Log file rotation strategy. See Poco FileChannel.">never</property>
       <property name="archive" desc="Append either timestamp or number to the archived log filename.">timestamp</property>
       <property name="compress" desc="Enable/disable log file compression.">true</property>
       <property name="purgeAge" desc="The maximum age of log files to preserve. See Poco FileChannel.">10 days</property>
       <property name="purgeCount" desc="The maximum number of log archives to preserve. Use 'none' to disable purging. See Poco FileChannel.">10</property>
       <property name="rotateOnOpen" desc="Enable/disable log file rotation on opening.">true</property>
       <property name="flush" desc="Enable/disable flushing after logging each line. May harm performance. Note that without flushing after each line, the log lines from the different processes will not appear in chronological order.">false</property>
     </file>
     <anonymize>
       <anonymize_user_data type="bool" desc="Enable to anonymize/obfuscate of user-data in logs. If default is true, it was forced at compile-time and cannot be disabled." default="false">false</anonymize_user_data>
       <anonymization_salt type="uint" desc="The salt used to anonymize/obfuscate user-data in logs. Use a secret 64-bit random number." default="82589933">82589933</anonymization_salt>
     </anonymize>
     <docstats type="bool" desc="Enable to see document handling information in logs." default="false">false</docstats>
     <userstats desc="Enable user stats. i.e: logs the details of a file and user" type="bool" default="false">false</userstats>
   </logging>
   <!--
          Note to developers: When you do "make run", the trace_event[@enable] will be set on the
          coolwsd command line, so if you want to change it for your testing, do it in Makefile.am,
          not here.
     -->
   <trace_event desc="The possibility to turn on generation of a Chrome Trace Event file" enable="false">
     <path desc="Output path for the Trace Event file, to which they will be written if turned on at run-time" type="string" default="/var/log/coolwsd.trace.json">/var/log/coolwsd.trace.json</path>
   </trace_event>
   <browser_logging desc="Logging in the browser console" default="false">false</browser_logging>
   <trace desc="Dump commands and notifications for replay. When 'snapshot' is true, the source file is copied to the path first." enable="false">
     <path desc="Output path to hold trace file and docs. Use '%' for timestamp to avoid overwriting. For example: /some/path/to/cooltrace-%.gz" compress="true" snapshot="false"/>
     <filter>
       <message desc="Regex pattern of messages to exclude"/>
     </filter>
     <outgoing>
       <record desc="Whether or not to record outgoing messages" default="false">false</record>
     </outgoing>
   </trace>
   <net desc="Network settings">
     <!-- On systems where localhost resolves to IPv6 [::1] address first, when net.proto is all and net.listen is loopback, coolwsd unexpectedly listens on [::1] only.
            You need to change net.proto to IPv4, if you want to use 127.0.0.1. -->
     <proto type="string" default="all" desc="Protocol to use IPv4, IPv6 or all for both">all</proto>
     <listen type="string" default="any" desc="Listen address that coolwsd binds to. Can be 'any' or 'loopback'.">any</listen>
     <!-- this allows you to shift all of our URLs into a sub-path from
            https://my.com/browser/a123... to https://my.com/my/sub/path/browser/a123... -->
     <service_root type="path" default="" desc="Prefix all the pages, websockets, etc. with this path."/>
     <post_allow desc="Allow/deny client IP address for POST(REST)." allow="true">
       <host desc="The IPv4 private 192.168 block as plain IPv4 dotted decimal addresses.">192\.168\.[0-9]{1,3}\.[0-9]{1,3}</host>
       <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:192\.168\.[0-9]{1,3}\.[0-9]{1,3}</host>
       <host desc="The IPv4 loopback (localhost) address.">127\.0\.0\.1</host>
       <host desc="Ditto, but as IPv4-mapped IPv6 address">::ffff:127\.0\.0\.1</host>
       <host desc="The IPv6 loopback (localhost) address.">::1</host>
       <host desc="The IPv4 private 172.16.0.0/12 subnet part 1.">172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
       <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
       <host desc="The IPv4 private 172.16.0.0/12 subnet part 2.">172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
       <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
       <host desc="The IPv4 private 172.16.0.0/12 subnet part 3.">172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}</host>
       <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}</host>
       <host desc="The IPv4 private 10.0.0.0/8 subnet (Podman).">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
       <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
     </post_allow>
     <content_security_policy desc="Customize the CSP header by specifying one or more policy-directive, separated by semicolons. See w3.org/TR/CSP2"/>
     <frame_ancestors desc="OBSOLETE: Use content_security_policy. Specify who is allowed to embed the Collabora Online iframe (coolwsd and WOPI host are always allowed). Separate multiple hosts by space."/>
     <connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by coolwsd (such as WOPI connections)." type="int" default="30"/>
     <!-- this setting radically changes how online works, it should not be used in a production environment -->
     <proxy_prefix type="bool" default="false" desc="Enable a ProxyPrefix to be passed int through which to redirect requests"/>
   </net>
   <ssl desc="SSL settings">
     <!-- switches from https:// + wss:// to http:// + ws:// -->
     <enable type="bool" desc="Controls whether SSL encryption between coolwsd and the network is enabled (do not disable for production deployment). If default is false, must first be compiled with SSL support to enable." default="true">false</enable>
     <!-- SSL off-load can be done in a proxy, if so disable SSL, and enable termination below in production -->
     <termination desc="Connection via proxy where coolwsd acts as working via https, but actually uses http." type="bool" default="true">true</termination>
     <cert_file_path desc="Path to the cert file" relative="false">/etc/coolwsd/cert.pem</cert_file_path>
     <key_file_path desc="Path to the key file" relative="false">/etc/coolwsd/key.pem</key_file_path>
     <ca_file_path desc="Path to the ca file" relative="false">/etc/coolwsd/ca-chain.cert.pem</ca_file_path>
     <cipher_list desc="List of OpenSSL ciphers to accept" default="ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"/>
     <hpkp desc="Enable HTTP Public key pinning" enable="false" report_only="false">
       <max_age desc="HPKP's max-age directive - time in seconds browser should remember the pins" enable="true">1000</max_age>
       <report_uri desc="HPKP's report-uri directive - pin validation failure are reported at this URL" enable="false"/>
       <pins desc="Base64 encoded SPKI fingerprints of keys to be pinned">
         <pin/>
       </pins>
     </hpkp>
     <sts desc="Strict-Transport-Security settings, per rfc6797. Subdomains are always included.">
       <enabled desc="Whether or not Strict-Transport-Security is enabled. Enable only when ready for production. Cannot be disabled without resetting the browsers." type="bool" default="false">false</enabled>
       <max_age desc="Strict-Transport-Security max-age directive, in seconds. 0 is allowed; please see rfc6797 for details. Defaults to 1 year." type="int" default="31536000">31536000</max_age>
     </sts>
   </ssl>
   <security desc="Altering these defaults potentially opens you to significant risk">
     <seccomp desc="Should we use the seccomp system call filtering." type="bool" default="true">true</seccomp>
     <capabilities desc="Should we require capabilities to isolate processes into chroot jails" type="bool" default="true">true</capabilities>
     <jwt_expiry_secs desc="Time in seconds before the Admin Console's JWT token expires" type="int" default="1800">1800</jwt_expiry_secs>
     <enable_macros_execution desc="Specifies whether the macro execution is enabled in general. This will enable Basic and Python scripts to execute both installed and from documents. If it is set to false, the macro_security_level is ignored. If it is set to true, the mentioned entry specified the level of macro security." type="bool" default="false">false</enable_macros_execution>
     <macro_security_level desc="Level of Macro security. 1 (Medium) Confirmation required before executing macros from untrusted sources. 0 (Low, not recommended) All macros will be executed without confirmation." type="int" default="1">1</macro_security_level>
     <enable_websocket_urp desc="Should we enable URP (UNO remote protocol) communication over the websocket. This allows full control of the Kit child server to anyone with access to the websocket including executing macros without confirmation or running arbitrary shell commands in the jail." type="bool" default="false">false</enable_websocket_urp>
     <enable_metrics_unauthenticated desc="When enabled, the /cool/getMetrics endpoint will not require authentication." type="bool" default="false">false</enable_metrics_unauthenticated>
   </security>
   <certificates>
     <database_path type="string" desc="Path to the NSS certificates that are used for signing documents" default=""/>
   </certificates>
   <watermark>
     <opacity desc="Opacity of on-screen watermark from 0.0 to 1.0" type="double" default="0.2"/>
     <text desc="Watermark text to be displayed on the document if entered" type="string"/>
   </watermark>
   <user_interface>
     <mode type="string" desc="Controls the user interface style. The 'default' means: Take the value from ui_defaults, or decide for one of compact or tabbed (default|compact|tabbed)" default="default">default</mode>
     <use_integration_theme desc="Use theme from the integrator" type="bool" default="true">true</use_integration_theme>
   </user_interface>
   <storage desc="Backend storage">
     <filesystem allow="false"/>
     <wopi desc="Allow/deny wopi storage." allow="true">
       <max_file_size desc="Maximum document size in bytes to load. 0 for unlimited." type="uint">0</max_file_size>
       <locking desc="Locking settings">
         <refresh desc="How frequently we should re-acquire a lock with the storage server, in seconds (default 15 mins) or 0 for no refresh" type="int" default="900">900</refresh>
       </locking>
-      <alias_groups desc="default mode is 'first' it allows only the first host when groups are not defined. set mode to 'groups' and define group to allow multiple host and its aliases" mode="first">
-        <group>
-                <host desc="hostname to allow or deny." allow="true">.*</host>
-        </group>
+      <alias_groups desc="default mode is 'first' it allows only the first host when groups are not defined. set mode to 'groups' and define group to allow multiple host and its aliases" mode="groups">
+        ALLOWED_HOSTS_GROUPS
         <!-- If you need to use multiple wopi hosts, please change the mode to "groups" and
                     add the hosts below.  If one host is accessible under multiple ip addresses
                     or names, add them as aliases. -->
         <!--<group>
                     <host desc="hostname to allow or deny." allow="true">scheme://hostname:port</host>
                     <alias desc="regex pattern of aliasname">scheme://aliasname1:port</alias>
                     <alias desc="regex pattern of aliasname">scheme://aliasname2:port</alias>
                     <unlock_link desc="Link from where user can unlock the features, which will get mapped with alias_group. According to hostname coolwsd will set the unlock link for feature unlock dialog. If not specified it will fallback to feature_lock.unlock_link entry" default=""></unlock_link>
             </group>-->
         <!-- More "group"s possible here -->
       </alias_groups>
     </wopi>
     <ssl desc="SSL settings">
       <as_scheme type="bool" default="true" desc="When set we exclusively use the WOPI URI's scheme to enable SSL for storage">true</as_scheme>
       <enable type="bool" desc="If as_scheme is false or not set, this can be set to force SSL encryption between storage and coolwsd. When empty this defaults to following the ssl.enable setting"/>
       <cert_file_path desc="Path to the cert file" relative="false"/>
       <key_file_path desc="Path to the key file" relative="false"/>
       <ca_file_path desc="Path to the ca file. If this is not empty, then SSL verification will be strict, otherwise cert of storage (WOPI-like host) will not be verified." relative="false"/>
       <cipher_list desc="List of OpenSSL ciphers to accept. If empty the defaults are used. These can be overridden only if absolutely needed."/>
     </ssl>
   </storage>
   <admin_console desc="Web admin console settings.">
     <enable desc="Enable the admin console functionality" type="bool" default="true">false</enable>
     <enable_pam desc="Enable admin user authentication with PAM" type="bool" default="false">false</enable_pam>
     <username desc="The username of the admin console. Ignored if PAM is enabled."/>
     <password desc="The password of the admin console. Deprecated on most platforms. Instead, use PAM or coolconfig to set up a secure password."/>
     <logging desc="Log admin activities irrespective of logging.level">
       <admin_login desc="log when an admin logged into the console" type="bool" default="true">true</admin_login>
       <metrics_fetch desc="log when metrics endpoint is accessed and metrics endpoint authentication is enabled" type="bool" default="true">true</metrics_fetch>
       <monitor_connect desc="log when external monitor gets connected" type="bool" default="true">true</monitor_connect>
       <admin_action desc="log when admin does some action for example killing a process" type="bool" default="true">true</admin_action>
     </logging>
   </admin_console>
   <monitors desc="Addresses of servers we connect to on start for monitoring">
     <!-- <monitor desc="Address of the monitor and interval after which it should try reconnting after disconnect" retryInterval="20">wss://foobar:234/ws</monitor> -->
   </monitors>
   <quarantine_files desc="Files are stored here to be examined later in cases of crashes or similar situation." default="false" enable="false">
     <limit_dir_size_mb desc="Maximum directory size. On exceeding the specified limit, older files will be deleted." default="250" type="uint"/>
     <max_versions_to_maintain desc="How many versions of the same file to keep." default="2" type="uint"/>
     <path desc="Path to directory under which quarantined files will be stored" type="path" relative="true" default="quarantine"/>
     <expiry_min desc="Time in mins after quarantined files will be deleted." type="int" default="30"/>
   </quarantine_files>
   <remote_config>
     <remote_url desc="remote server to which you will send resquest to get remote config in response" type="string" default=""/>
   </remote_config>
   <stop_on_config_change desc="Stop coolwsd whenever config files change." type="bool" default="false">false</stop_on_config_change>
   <remote_font_config>
     <url desc="URL of optional JSON file that lists fonts to be included in Online" type="string" default=""/>
   </remote_font_config>
   <home_mode>
     <enable desc="Enable more configuration options for home users" type="bool" default="false">false</enable>
   </home_mode>
   <fonts_missing>
     <handling desc="How to handle fonts mising in a document: 'report', 'log', 'both', or 'ignore'" type="string" default="log">log</handling>
   </fonts_missing>
   <indirection_endpoint>
     <url desc="URL endpoint to server which servers routeToken in json format" default=""/>
   </indirection_endpoint>
   <feature_lock desc="Feature lock settings">
     <locked_hosts desc="Allow/deny feature-locked hosts. When allowed, the below host specification overrides the CheckFileInfo response." allow="false">
       <fallback desc="What to do if the given host is not covered by any rule in locked_hosts" read_only="true" disabled_commands="true"/>
       <host desc="Regex pattern of hostname to set as full-featured or locked." read_only="false" disabled_commands="false">localhost</host>
       <host desc="Regex pattern of hostname to set as full-featured or locked." read_only="false" disabled_commands="false">10\.0-9{1,3}\.0-9{1,3}\.0-9{1,3}</host>
       <host desc="Regex pattern of hostname to set as full-featured or locked." read_only="false" disabled_commands="false">172\.301\.0-9{1,3}\.0-9{1,3}</host>
     </locked_hosts>
     <is_lock_readonly desc="Give locked users read only access to the documents. If this is set to true it will make all the locked_host readonly who has disabled_commands set to true" type="bool" default="false">false</is_lock_readonly>
     <locked_commands desc="List of commands to lock the functionality" default=".uno:DataDataPilotRun .uno:RecalcPivotTable .uno:DeletePivotTable .uno:SamplingDialog .uno:DescriptiveStatisticsDialog .uno:AnalysisOfVarianceDialog .uno:CorrelationDialog .uno:CovarianceDialog .uno:ExponentialSmoothingDialog .uno:MovingAverageDialog .uno:RegressionDialog .uno:TTestDialog .uno:FTestDialog .uno:ZTestDialog .uno:ChiSquareTestDialog .uno:FourierAnalysisDialog .uno:Validation .uno:DataFilterSpecialFilter .uno:TrackChanges .uno:AcceptTrackedChanges .uno:InsertReferenceField .uno:Watermark .uno:InsertIndexesEntry .uno:InsertMultiIndex .uno:SlideMasterPage exportepub downloadas-rtf masterslidebutton">.uno:DataDataPilotRun .uno:RecalcPivotTable .uno:DeletePivotTable .uno:SamplingDialog .uno:DescriptiveStatisticsDialog .uno:AnalysisOfVarianceDialog .uno:CorrelationDialog .uno:CovarianceDialog .uno:ExponentialSmoothingDialog .uno:MovingAverageDialog .uno:RegressionDialog .uno:TTestDialog .uno:FTestDialog .uno:ZTestDialog .uno:ChiSquareTestDialog .uno:FourierAnalysisDialog .uno:Validation .uno:DataFilterSpecialFilter .uno:TrackChanges .uno:AcceptTrackedChanges .uno:InsertReferenceField .uno:Watermark .uno:InsertIndexesEntry .uno:InsertMultiIndex .uno:SlideMasterPage exportepub downloadas-rtf masterslidebutton</locked_commands>
     <unlock_title desc="Title to show user when prompting the unlock popup" default="Unlock your potential">Unlock your potential</unlock_title>
     <unlock_link desc="Link from where user can unlock the features" default="https://www.collaboraoffice.com/subscriptions/">https://www.collaboraoffice.com/subscriptions/</unlock_link>
     <unlock_description desc="Description about unlocking features" default="Head over to the details page and discover all the features:">Head over to the details page and discover all the features:</unlock_description>
     <unlock_image desc="URL of image shown when unlock dialog get displayed" default=""/>
     <writer_unlock_highlights desc="Short note about Writer benefits of unlocking" default="Review and write with ease">Review and write with ease</writer_unlock_highlights>
     <calc_unlock_highlights desc="Short note about Calc benefits of unlocking" default="Get a better picture of your data">Get a better picture of your data</calc_unlock_highlights>
     <impress_unlock_highlights desc="Short note about Impress benefits of unlocking" default="Nail your next presentation">Nail your next presentation</impress_unlock_highlights>
     <draw_unlock_highlights desc="Short note about Draw benefits of unlocking" default="Draw and get organized">Draw and get organized</draw_unlock_highlights>
     <translations>
       <!-- Example to add german language for feature lock dialog -->
       <!--
             <language name="de">
                 <unlock_title desc="Title to show user when prompting the unlock popup" default="Entfesseln Sie Ihr Potenzial">Entfesseln Sie Ihr Potenzial</unlock_title>
                 <unlock_description desc="Description about unlocking features" default="Gehen Sie zur Detailseite und entdecken Sie alle Funktionen:">Gehen Sie zur Detailseite und entdecken Sie alle Funktionen:</unlock_description>
                 <writer_unlock_highlights desc="Short note about Writer benefits of unlocking" default="Überprüfen und schreiben Sie mit Leichtigkeit">Überprüfen und schreiben Sie mit Leichtigkeit</writer_unlock_highlights>
                 <calc_unlock_highlights desc="Short note about Calc benefits of unlocking" default="Machen Sie sich ein besseres Bild von Ihren Daten">Machen Sie sich ein besseres Bild von Ihren Daten</calc_unlock_highlights>
                 <impress_unlock_highlights desc="Short note about Impress benefits of unlocking" default="Bringen Sie Ihre nächste Präsentation auf den Punkt">Bringen Sie Ihre nächste Präsentation auf den Punkt</impress_unlock_highlights>
                 <draw_unlock_highlights desc="Short note about Draw benefits of unlocking" default="Zeichne und organisiere dich">Zeichne und organisiere dich</draw_unlock_highlights>
             </language>
             -->
     </translations>
   </feature_lock>
   <restricted_commands dec="List of uno commands to be disabled"/>
   <zotero desc="Zotero plugin configuration. For more details about Zotero visit https://www.zotero.org/">
     <enable desc="Enable Zotero plugin." type="bool" default="true">true</enable>
   </zotero>
   <help_url desc="The Help root URL, or empty for no help (hides the Help buttons)" type="string" default="https://help.collaboraoffice.com/help.html?">https://help.collaboraoffice.com/help.html?</help_url>
   <overwrite_mode>
     <enable desc="Enable overwrite mode (user can use insert key)" type="bool" default="true">true</enable>
   </overwrite_mode>
 </config>
diff --git a/docker/collabora/init.sh b/docker/collabora/init.sh
index 04016b43..6b289e32 100755
--- a/docker/collabora/init.sh
+++ b/docker/collabora/init.sh
@@ -1,25 +1,31 @@
 #!/bin/sh
 
 
+GROUPSSTRING=""
+for HOST in $ALLOWED_HOSTS; do
+    GROUPSSTRING="$GROUPSSTRING<group><host desc=\"hostname to allow or deny.\" allow=\"true\">$HOST</host></group>\n"
+done
+
+sed -i -e "s|ALLOWED_HOSTS_GROUPS|$GROUPSSTRING|" /etc/coolwsd/coolwsd.xml
+
 mkdir -p /tmp/ssl/
 pushd /tmp/ssl/
 mkdir -p certs/ca
 openssl rand -writerand /opt/cool/.rnd
 openssl genrsa -out certs/ca/root.key.pem 2048
 openssl req -x509 -new -nodes -key certs/ca/root.key.pem -days 9131 -out certs/ca/root.crt.pem -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=Dummy Authority"
-mkdir -p certs/servers
 mkdir -p certs/tmp
 mkdir -p certs/servers/localhost
 openssl genrsa -out certs/servers/localhost/privkey.pem 2048
 if test "${cert_domain-set}" = set; then
-openssl req -key certs/servers/localhost/privkey.pem -new -sha256 -out certs/tmp/localhost.csr.pem -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=localhost"
+    openssl req -key certs/servers/localhost/privkey.pem -new -sha256 -out certs/tmp/localhost.csr.pem -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=localhost"
 else
-openssl req -key certs/servers/localhost/privkey.pem -new -sha256 -out certs/tmp/localhost.csr.pem -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=${cert_domain}"
+    openssl req -key certs/servers/localhost/privkey.pem -new -sha256 -out certs/tmp/localhost.csr.pem -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=${cert_domain}"
 fi
 openssl x509 -req -in certs/tmp/localhost.csr.pem -CA certs/ca/root.crt.pem -CAkey certs/ca/root.key.pem -CAcreateserial -out certs/servers/localhost/cert.pem -days 9131
 mv -f certs/servers/localhost/privkey.pem /etc/coolwsd/key.pem
 mv -f certs/servers/localhost/cert.pem /etc/coolwsd/cert.pem
 mv -f certs/ca/root.crt.pem /etc/coolwsd/ca-chain.cert.pem
 popd
 
 exec /usr/bin/coolwsd --version --o:sys_template_path=/opt/cool/systemplate --o:child_root_path=/opt/cool/child-roots --o:file_server_root_path=/usr/share/coolwsd --o:logging.color=false --o:stop_on_config_change=true