diff --git a/modules/nixos/services/caddy/default.nix b/modules/nixos/services/caddy/default.nix
index eff5f99..79fdaef 100644
--- a/modules/nixos/services/caddy/default.nix
+++ b/modules/nixos/services/caddy/default.nix
@@ -107,7 +107,7 @@ let
 
               @office host office.mjallen.dev
               handle @office {
-                reverse_proxy http://10.0.1.3:${toString config.${namespace}.services.onlyoffice.port}
+                reverse_proxy http://10.0.1.3:${toString config.${namespace}.services.collabora.port}
               }
             '';
           };
diff --git a/modules/nixos/services/collabora/default.nix b/modules/nixos/services/collabora/default.nix
index 5accdcd..065e694 100644
--- a/modules/nixos/services/collabora/default.nix
+++ b/modules/nixos/services/collabora/default.nix
@@ -39,12 +39,19 @@ let
           # Restrict loading documents from WOPI Host
           storage.wopi = {
             "@allow" = true;
-            host = [ "cloud.mjallen.dev" ];
+            "allow" = true;
+            host = [ "https://cloud.mjallen.dev:443" ];
           };
 
           # Set FQDN of server
           server_name = "office.mjallen.dev";
         };
+
+        aliasGroups = [
+          {
+            host = "https://cloud.mjallen.dev:443";
+          }
+        ];
       };
     };
   };
diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix
index d1e7e12..90c3790 100644
--- a/modules/nixos/services/nextcloud/default.nix
+++ b/modules/nixos/services/nextcloud/default.nix
@@ -27,6 +27,11 @@ let
         configureRedis = true;
         enableImagemagick = true;
         appstoreEnable = true;
+
+        # extraApps = with pkgs.${namespace}; {
+        #   richdocumentscode = nextcloud-code-server;
+        #   # richdocuments = nextcloud-richdocuments;
+        # };
         
         # Use PostgreSQL for database
         config = {
@@ -69,6 +74,8 @@ let
         https = false;
 
         settings = {
+          overwrite.cli.url = "https://cloud.mjallen.dev";
+          log_type = "file";
           default_phone_region = "US";
           trusted_proxies = [ "10.0.1.3" ];
           trusted_domains = [
@@ -97,6 +104,7 @@ let
       # Configure web server
       services.nginx = {
         enable = true;
+        group = "jallen-nas";
         virtualHosts.${config.services.nextcloud.hostName} = {
           listen = [{
             addr = "0.0.0.0";
diff --git a/packages/nextcloud/nextcloud-code-server/default.nix b/packages/nextcloud/nextcloud-code-server/default.nix
new file mode 100644
index 0000000..48debcc
--- /dev/null
+++ b/packages/nextcloud/nextcloud-code-server/default.nix
@@ -0,0 +1,10 @@
+{
+  fetchNextcloudApp,
+  ...
+}:
+fetchNextcloudApp {
+  name = "nextcloud-app-richdocumentscode";
+  sha256 = "sha256-WnMqfHM19nWYknBn5o3Qql2flLw6vExgWQ1FlMcmySk=";
+  url = "https://github.com/CollaboraOnline/richdocumentscode/releases/download/25.4.802/richdocumentscode.tar.gz";
+  license = "agpl3Only";
+}
diff --git a/packages/nextcloud/nextcloud-richdocuments/default.nix b/packages/nextcloud/nextcloud-richdocuments/default.nix
new file mode 100644
index 0000000..d98b783
--- /dev/null
+++ b/packages/nextcloud/nextcloud-richdocuments/default.nix
@@ -0,0 +1,10 @@
+{
+  fetchNextcloudApp,
+  ...
+}:
+fetchNextcloudApp {
+  name = "nextcloud-app-richdocuments";
+  sha256 = "sha256-Uk8GVXMpioV7xprnPXdaD/5Y0I4SH0IezGsJgpF2HLg=";
+  url = "https://github.com/nextcloud/richdocuments/archive/refs/tags/v9.0.2.tar.gz";
+  license = "agpl3Only";
+}
diff --git a/systems/x86_64-linux/jallen-nas/apps.nix b/systems/x86_64-linux/jallen-nas/apps.nix
index 732ae3a..0670f83 100755
--- a/systems/x86_64-linux/jallen-nas/apps.nix
+++ b/systems/x86_64-linux/jallen-nas/apps.nix
@@ -71,7 +71,7 @@ in
         reverseProxy = enabled;
       };
       collabora = {
-        enable = false;
+        enable = true;
         port = 9980;
       };
       crowdsec = {
@@ -158,7 +158,7 @@ in
       };
       ocis = disabled;
       onlyoffice = {
-        enable = true;
+        enable = false;
         port = 9200;
       };
       opencloud = {
diff --git a/systems/x86_64-linux/jallen-nas/sops.nix b/systems/x86_64-linux/jallen-nas/sops.nix
index 5599f0b..7658dcf 100755
--- a/systems/x86_64-linux/jallen-nas/sops.nix
+++ b/systems/x86_64-linux/jallen-nas/sops.nix
@@ -154,7 +154,7 @@ in
 
       "jallen-nas/onlyoffice-key" = {
         sopsFile = defaultSops;
-        mode = "0650";
+        mode = "0655";
         owner = config.users.users."${user}".name;
         group = config.users.users."${user}".group;
         restartUnits = [ "container@nextcloud.service" ];