diff --git a/hosts/nachtigall/apps/nextcloud.nix b/hosts/nachtigall/apps/nextcloud.nix
new file mode 100644
index 00000000..26895970
--- /dev/null
+++ b/hosts/nachtigall/apps/nextcloud.nix
@@ -0,0 +1,81 @@
+{ config, pkgs, ... }:
+{
+  services.nextcloud = {
+    hostName = "cloud.pub.solar";
+    home = "/var/lib/nextcloud";
+
+    enable = true;
+    https = true;
+    secretFile = ""; # secret
+
+    configureRedis = true;
+
+    notify_push = {
+      enable = true;
+    };
+
+    config = {
+      adminuser = "admin";
+      dbuser = "nextcloud";
+      dbtype = "pgsql";
+      dbname = "nextcloud";
+      dbtableprefix = "oc_";
+      overwriteProtocol = "https";
+    };
+
+    extraOptions = {
+      overwrite.cli.url = "http://cloud.pub.solar";
+
+      installed = true;
+      default_phone_region = "+49";
+      mail_sendmailmode = "smtp";
+      mail_from_address = "nextcloud";
+      mail_smtpmode = "smtp";
+      mail_smtpauthtype = "PLAIN";
+      mail_domain = "pub.solar";
+      mail_smtpname = "admins@pub.solar";
+      mail_smtpsecure = "tls";
+      mail_smtpauth = 1;
+      mail_smtphost = "mx2.greenbaum.cloud";
+      mail_smtpport = "587";
+
+      enable_previews = true;
+      enabledPreviewProviders = [
+        "OC\\Preview\\PNG"
+        "OC\\Preview\\JPEG"
+        "OC\\Preview\\GIF"
+        "OC\\Preview\\BMP"
+        "OC\\Preview\\XBitmap"
+        "OC\\Preview\\Movie"
+        "OC\\Preview\\PDF"
+        "OC\\Preview\\MP3"
+        "OC\\Preview\\TXT"
+        "OC\\Preview\\MarkDown"
+      ];
+      preview_max_x = "1024";
+      preview_max_y = "768";
+      preview_max_scale_factor = "1";
+
+      auth.bruteforce.protection.enabled = true;
+      trashbin_retention_obligation = "auto,7";
+      skeletondirectory = "";
+      defaultapp = "file";
+      activity_expire_days = "14";
+      integrity.check.disabled = false;
+      updater.release.channel = "stable";
+      loglevel = 0;
+      maintenance = false;
+      app_install_overwrite = [
+        "pdfdraw"
+        "integration_whiteboard"
+      ];
+      htaccess.RewriteBase = "/";
+      theme = "";
+      simpleSignUpLink.shown = false;
+    };
+
+    caching.redis = true;
+    autoUpdateApps.enable = true;
+    database.createLocally = true;
+  };
+}
diff --git a/hosts/nachtigall/nextcloud.nix b/hosts/nachtigall/nextcloud.nix
deleted file mode 100644
index 6206806c..00000000
--- a/hosts/nachtigall/nextcloud.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ config, pkgs, ... }:
-{
-  services.caddy.virtualHosts."cloud.pub.solar" = {
-    # logFormat = lib.mkForce ''
-    #   output discard
-    # '';
-    extraConfig = ''
-      reverse_proxy :8080
-    '';
-  };
-
-  services.nginx.virtualHosts."localhost".listen = [ { addr = "127.0.0.1"; port = 8080; } ];
-
-  services.nextcloud = {
-    enable = true;
-    https = true;
-    secretFile = ""; # secret
-
-    notify_push = {
-      enable = true;
-    };
-
-    config = {
-      adminuser = "admin";
-      dbuser = "nextcloud";
-      dbtype = "pgsql";
-      dbname = "nextcloud";
-      dbtableprefix = "oc_";
-      trustedProxies = [
-        "cloud.pub.solar"
-      ];
-    };
-
-    autoUpdateApps.enable = true;
-    database.createLocally = true;
-  };
-}