diff --git a/services/bitwarden_rs.nix b/services/bitwarden_rs.nix
index 0dd8eff..09ca5e8 100644
--- a/services/bitwarden_rs.nix
+++ b/services/bitwarden_rs.nix
@@ -36,7 +36,7 @@ in {
         '';
     };
 
-    services.postgresqlBackup = {
+    services.postgresqlBackup = mkIf my.services.postgresql-backup.enable {
       databases = [ "bitwarden_rs" ];
     };
 
diff --git a/services/default.nix b/services/default.nix
index a1ae911..a8891a8 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -14,7 +14,6 @@
     ./nextcloud.nix
     ./nginx.nix
     ./postgresql-backup.nix
-    ./postgresql.nix
     ./tgv.nix
     ./transmission.nix
     ./wireguard.nix
diff --git a/services/gitea.nix b/services/gitea.nix
index 0f47cba..42615b4 100644
--- a/services/gitea.nix
+++ b/services/gitea.nix
@@ -79,7 +79,7 @@ in {
       ];
     };
 
-    services.postgresqlBackup = {
+    services.postgresqlBackup = mkIf my.services.postgresql-backup.enable {
       databases = [ "gitea" ];
     };
 
diff --git a/services/matrix.nix b/services/matrix.nix
index 404774a..86aeefa 100644
--- a/services/matrix.nix
+++ b/services/matrix.nix
@@ -33,9 +33,10 @@ in {
   config = lib.mkIf cfg.enable {
     services.postgresql = {
       enable = true;
+      package = pkgs.postgresql_12;
     };
 
-    services.postgresqlBackup = {
+    services.postgresqlBackup = mkIf my.services.postgresql-backup.enable {
       databases = [ "matrix-synapse" ];
     };
 
diff --git a/services/miniflux.nix b/services/miniflux.nix
index 297eba7..35a5fe2 100644
--- a/services/miniflux.nix
+++ b/services/miniflux.nix
@@ -29,7 +29,7 @@ in {
   config = mkIf cfg.enable {
     # services.postgresql is automatically enabled by services.miniflux, let's
     # back it up
-    services.postgresqlBackup = {
+    services.postgresqlBackup = mkIf my.services.postgresql-backup.enable {
       databases = [ "miniflux" ];
     };
 
diff --git a/services/nextcloud.nix b/services/nextcloud.nix
index 8c87c6d..1ab9924 100644
--- a/services/nextcloud.nix
+++ b/services/nextcloud.nix
@@ -14,6 +14,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    # FIXME: set postgresql package globally
     services.postgresql = {
       enable = true;
 
diff --git a/services/postgresql.nix b/services/postgresql.nix
deleted file mode 100644
index a6d1f05..0000000
--- a/services/postgresql.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, ... }:
-{
-  # set postgresql version so we don't get any bad surprise
-  config.services.postgresql = {
-    package = pkgs.postgresql_12;
-  };
-}