diff --git a/modules/nextcloud.nix b/modules/nextcloud.nix
index c4be039..745cd30 100644
--- a/modules/nextcloud.nix
+++ b/modules/nextcloud.nix
@@ -38,15 +38,14 @@ in
     };
   };
 
-  services.postgresql = {
+  clan.core.postgresql = {
     enable = true;
-    ensureDatabases = [ "nextcloud" ];
-    ensureUsers = [
-      {
-        name = "nextcloud";
-        ensureDBOwnership = true;
-      }
-    ];
+    databases = {
+      nextcloud = {
+        create.enable = true;
+        restore.stopOnRestore = [ "nextcloud" ];
+      };
+    };
   };
 
   systemd.services."nextcloud-setup" = {