diff --git a/nextcloud/config.php b/nextcloud/config.php
index 941ba57..4895810 100644
--- a/nextcloud/config.php
+++ b/nextcloud/config.php
@@ -5,7 +5,7 @@ $CONFIG = array (
   'secret' => 'xfKWpSH0/UV4PYUClkDRyaeiYc2SugcEe0/mZVB7/6lElAQE',
   'trusted_domains' => 
   array (
-    0 => 'cloud.calad.re',
+    0 => 'cloud.oasis21.org',
   ),
   'apps_paths' =>
   array (
@@ -25,7 +25,7 @@ $CONFIG = array (
   'datadirectory' => '/var/www/html/data',
   'dbtype' => 'pgsql',
   'version' => '23.0.0.10',
-  'overwrite.cli.url' => 'https://cloud.calad.re',
+  'overwrite.cli.url' => 'https://cloud.oasis21.org',
   'dbname' => 'nc',
   'dbhost' => 'nextcloud-db',
   'dbport' => '',
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index c0043dd..58a3522 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -34,7 +34,7 @@ services:
     restart: unless-stopped
     labels:
       traefik.http.routers.nextcloud-web.entrypoints: websecure
-      traefik.http.routers.nextcloud-web.rule: Host(`cloud.calad.re`)
+      traefik.http.routers.nextcloud-web.rule: Host(`cloud.oasis21.org`)
       traefik.http.services.nextcloud-web.loadbalancer.server.port: 80
       traefik.enable: true
       # https://docs.nextcloud.com/server/16/admin_manual/configuration_server/reverse_proxy_configuration.html
@@ -94,7 +94,7 @@ services:
       unless-stopped
     labels:
       traefik.http.routers.collabora.entrypoints: websecure
-      traefik.http.routers.collabora.rule: Host(`code.calad.re`)
+      traefik.http.routers.collabora.rule: Host(`code.oasis21.org`)
       traefik.http.services.collabora.loadbalancer.server.port: 9980
       traefik.enable: true
 
diff --git a/nextcloud/loolwsd.xml b/nextcloud/loolwsd.xml
index 00f6eae..1fd2e18 100644
--- a/nextcloud/loolwsd.xml
+++ b/nextcloud/loolwsd.xml
@@ -8,7 +8,7 @@
     <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"></sys_template_path>
     <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"></child_root_path>
 
-    <server_name desc="External hostname:port of the server running loolwsd. If empty, it's derived from the request (please set it if this doesn't work). Must be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default="">code.calad.re</server_name>
+    <server_name desc="External hostname:port of the server running loolwsd. If empty, it's derived from the request (please set it if this doesn't work). Must be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default="">code.oasis21.org</server_name>
     <file_server_root_path desc="Path to the directory that should be considered root for the file server. This should be the directory containing loleaflet." type="path" relative="true" default="loleaflet/../"></file_server_root_path>
 
     <memproportion desc="The maximum percentage of system memory consumed by all of the LibreOffice Online, after which we start cleaning up idle documents" type="double" default="80.0"></memproportion>
@@ -87,7 +87,7 @@
         <host desc="The IPv4 private 172.17.0.0/16 subnet (Docker).">172\.17\.[0-9]{1,3}\.[0-9]{1,3}</host>
         <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.17\.[0-9]{1,3}\.[0-9]{1,3}</host>
       </post_allow>
-      <frame_ancestors desc="Specify who is allowed to embed the LO Online iframe (loolwsd and WOPI host are always allowed). Separate multiple hosts by space.">cloud.calad.re</frame_ancestors>
+      <frame_ancestors desc="Specify who is allowed to embed the LO Online iframe (loolwsd and WOPI host are always allowed). Separate multiple hosts by space.">cloud.oasis21.org</frame_ancestors>
     </net>
 
     <ssl desc="SSL settings">
@@ -125,7 +125,7 @@
     <storage desc="Backend storage">
         <filesystem allow="false" />
         <wopi desc="Allow/deny wopi storage. Mutually exclusive with webdav." allow="true">
-            <host desc="Regex pattern of hostname to allow or deny." allow="true">cloud.calad.re</host>
+            <host desc="Regex pattern of hostname to allow or deny." allow="true">cloud.oasis21.org</host>
             <host desc="Regex pattern of hostname to allow or deny." allow="true">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
             <host desc="Regex pattern of hostname to allow or deny." allow="true">172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
             <host desc="Regex pattern of hostname to allow or deny." allow="true">172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
@@ -139,7 +139,7 @@
             </locking>
         </wopi>
         <webdav desc="Allow/deny webdav storage. Mutually exclusive with wopi." allow="false">
-            <host desc="Hostname to allow" allow="true">cloud.calad.re</host>
+            <host desc="Hostname to allow" allow="true">cloud.oasis21.org</host>
         </webdav>
         <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>