diff --git a/modules/nixos/services/accentor/default.nix b/modules/nixos/services/accentor/default.nix
index 9bc63943..e851922c 100644
--- a/modules/nixos/services/accentor/default.nix
+++ b/modules/nixos/services/accentor/default.nix
@@ -7,10 +7,7 @@
   };
 
   config = lib.mkIf config.chvp.services.accentor.enable {
-    services.postgresql = {
-      enable = true;
-      dataDir = "${config.chvp.dataPrefix}/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}";
-    };
+    services.postgresql.enable = true;
 
     services.accentor = {
       enable = true;
diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix
index d060a2bc..6a8f368b 100644
--- a/modules/nixos/services/default.nix
+++ b/modules/nixos/services/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   imports = [
@@ -16,5 +16,8 @@
     ./torrents
   ];
 
-  services.postgresql.package = pkgs.postgresql_15;
+  services.postgresql = {
+    package = pkgs.postgresql_15;
+    dataDir = "${config.chvp.dataPrefix}/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}";
+  };
 }
diff --git a/modules/nixos/services/grafana/default.nix b/modules/nixos/services/grafana/default.nix
index fb9d845c..564332c7 100644
--- a/modules/nixos/services/grafana/default.nix
+++ b/modules/nixos/services/grafana/default.nix
@@ -73,7 +73,6 @@
       };
       postgresql = {
         enable = true;
-        dataDir = "${config.chvp.dataPrefix}/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}";
         ensureDatabases = [ "grafana" ];
         ensureUsers = [{
           name = "grafana";
diff --git a/modules/nixos/services/matrix/default.nix b/modules/nixos/services/matrix/default.nix
index 716ff53d..cd0aacec 100644
--- a/modules/nixos/services/matrix/default.nix
+++ b/modules/nixos/services/matrix/default.nix
@@ -76,7 +76,6 @@
       };
       postgresql = {
         enable = true;
-        dataDir = "${config.chvp.dataPrefix}/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}";
         ensureDatabases = [
           "matrix-synapse"
           "matrix_appservice_slack"
diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix
index e74cb93c..5cc0f273 100644
--- a/modules/nixos/services/nextcloud/default.nix
+++ b/modules/nixos/services/nextcloud/default.nix
@@ -41,7 +41,6 @@
       };
       postgresql = {
         enable = true;
-        dataDir = "${config.chvp.dataPrefix}/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}";
         ensureDatabases = [ "nextcloud" ];
         ensureUsers = [{
           name = "nextcloud";