diff --git a/hosts/vps/toggles.nix b/hosts/vps/toggles.nix
index f99182e..1d7049c 100644
--- a/hosts/vps/toggles.nix
+++ b/hosts/vps/toggles.nix
@@ -3,10 +3,10 @@ let
   inherit (inputs.self.lib)
     enableList
     mkEnabled
-    mkEnabledProxy
     mkEnabledWithUsers
     ;
-  mkEnabledProxyIp = inputs.self.lib.mkEnabledProxyIp config.my.ips.wg-server;
+  wgServerIp = config.my.ips.wg-server;
+  mkEnabledProxyIp = inputs.self.lib.mkEnabledProxyIp wgServerIp;
 in
 {
   enableProxy = true;
@@ -33,9 +33,11 @@ in
     };
     nextcloud = {
       enableProxy = true;
+      ip = wgServerIp;
+      port = 8081;
     };
   }
-  // enableList mkEnabledProxy [
+  // enableList mkEnabledProxyIp [
     "bazarr"
     "collabora"
     "gitea"
@@ -53,8 +55,6 @@ in
     "radarr"
     "sonarr"
     "yamtrack"
-  ]
-  // enableList mkEnabledProxyIp [
     "audiobookshelf"
     "isso"
     "keycloak"
diff --git a/modules/modules.nix b/modules/modules.nix
index c1318fa..b19c389 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -74,7 +74,7 @@ in
     };
     mainServer = lib.mkOption {
       type = lib.types.str;
-      default = "vps";
+      default = "server";
       description = "The hostname of the main server.";
     };
     postgresSocket = lib.mkOption {
diff --git a/modules/servers/nextcloud.nix b/modules/servers/nextcloud.nix
index 30e4853..85fed84 100644
--- a/modules/servers/nextcloud.nix
+++ b/modules/servers/nextcloud.nix
@@ -261,7 +261,7 @@ in
       collabora = lib.mkIf cfgC.enable {
         autoStart = true;
         image = "collabora/code:latest";
-        ports = [ "9980:9980" ];
+        ports = [ "${toString cfgC.port}:${toString cfgC.port}" ];
         environment = {
           TZ = config.my.timeZone;
           domain = cfg.host;
diff --git a/parts/core.nix b/parts/core.nix
index 69febd7..45a71c7 100644
--- a/parts/core.nix
+++ b/parts/core.nix
@@ -196,16 +196,10 @@ in
           inherit ip;
         };
       };
-      mkEnabledProxy = name: {
-        inherit name;
-        value = {
-          enableProxy = true;
-        };
-      };
       mkEnabledProxyIp = ip: name: {
         inherit name;
         value = {
-          enable = true;
+          enableProxy = true;
           inherit ip;
         };
       };