diff --git a/boxes/copernicus/services/default.nix b/boxes/copernicus/services/default.nix
index a04d751..47d2875 100644
--- a/boxes/copernicus/services/default.nix
+++ b/boxes/copernicus/services/default.nix
@@ -3,6 +3,5 @@
 {
   imports = [
     ./wireguard.nix
-    ./nextcloud.nix
   ];
 }
diff --git a/boxes/copernicus/services/nextcloud.nix b/boxes/copernicus/services/nextcloud.nix
index 9e05107..467ac52 100644
--- a/boxes/copernicus/services/nextcloud.nix
+++ b/boxes/copernicus/services/nextcloud.nix
@@ -8,7 +8,6 @@
     config.adminpassFile = "/etc/nextcloud-admin";
     settings.overwriteprotocol = "https";
     extraApps = {
-      inherit (config.services.nextcloud.package.packages.apps) calendar tasks mail;
       phonetrack = pkgs.fetchNextcloudApp {
         sha256 = "sha256-V92f+FiS5vZEkq15A51pHoDpUOBfUOEVIcsXdP/rSMQ=";
         license = "agpl3Only";
diff --git a/boxes/netbox/default.nix b/boxes/netbox/default.nix
index aa7d7f5..8c55069 100644
--- a/boxes/netbox/default.nix
+++ b/boxes/netbox/default.nix
@@ -15,8 +15,7 @@
       ./nginx.nix
       ./franklincce.nix
       ./wireguard.nix
-
-      ./nextcloud-bridge.nix
+      ./nextcloud.nix
     ];
 
   nix = {
diff --git a/boxes/netbox/nextcloud-bridge.nix b/boxes/netbox/nextcloud-bridge.nix
deleted file mode 100644
index 712255f..0000000
--- a/boxes/netbox/nextcloud-bridge.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ lib, config, pkgs, ... }:
-{
-  services.nginx.virtualHosts."nextcloud.beepboop.systems" = {
-    forceSSL = true;
-    enableACME = true;
-    locations."/" = {
-      proxyPass = "http://10.100.0.2:5028";
-      proxyWebsockets = true;
-      extraConfig = ''
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header Host $host;
-        proxy_buffering off;
-      '';
-    };
-  };
-}
diff --git a/boxes/netbox/nextcloud.nix b/boxes/netbox/nextcloud.nix
new file mode 100644
index 0000000..7986cb7
--- /dev/null
+++ b/boxes/netbox/nextcloud.nix
@@ -0,0 +1,24 @@
+{ lib, config, pkgs, ... }:
+{
+  services.nextcloud = {
+    enable = true;
+    https = true;
+    package = pkgs.nextcloud30;
+    hostName = "nextcloud.beepboop.systems";
+    config.adminpassFile = "/etc/nextcloud-admin";
+    settings.overwriteprotocol = "https";
+    extraApps = {
+      phonetrack = pkgs.fetchNextcloudApp {
+        sha256 = "sha256-V92f+FiS5vZEkq15A51pHoDpUOBfUOEVIcsXdP/rSMQ=";
+        license = "agpl3Only";
+        url = "https://github.com/julien-nc/phonetrack/releases/download/v0.8.1/phonetrack-0.8.1.tar.gz";
+      };
+    };
+    extraAppsEnable = true;
+  };
+
+  services.nginx.virtualHosts."${config.services.nextcloud.hostName}" = {
+    forceSSL = true;
+    enableACME = true;
+  };
+}