diff --git a/systems/makanek/nextcloud.nix b/systems/makanek/nextcloud.nix
index 181c13c..6a03bba 100644
--- a/systems/makanek/nextcloud.nix
+++ b/systems/makanek/nextcloud.nix
@@ -4,7 +4,6 @@
   lib,
   ...
 }: let
-  inherit (import ../../lib) localAddresses;
   storageBoxMountPoint = "/mnt/storagebox";
 in {
   # https://docs.hetzner.com/de/robot/storage-box/access/access-samba-cifs/
@@ -24,6 +23,11 @@ in {
     ];
   };
 
+  systemd.services.nextcloud-setup = {
+    wants = ["mnt-storagebox.mount" "postgresql.service"];
+    after = ["mnt-storagebox.mount" "postgresql.service"];
+  };
+
   age.secrets = {
     hetzner-storagebox-credentials = {
       file = ../../secrets/hetzner-storagebox-credentials.age;
@@ -123,10 +127,4 @@ in {
     enableACME = true;
     forceSSL = true;
   };
-
-  # Ensure that postgres is running before running the setup
-  systemd.services."nextcloud-setup" = {
-    requires = ["postgresql.service"];
-    after = ["postgresql.service"];
-  };
 }