diff --git a/modules/nixos/services/communication/matrix/default.nix b/modules/nixos/services/communication/matrix/default.nix
index d2e47b0..903de32 100644
--- a/modules/nixos/services/communication/matrix/default.nix
+++ b/modules/nixos/services/communication/matrix/default.nix
@@ -17,6 +17,10 @@
   database = "synapse";
   keyFile = "/var/lib/element-call/key";
 in {
+  imports = [
+    ./mautrix-starr.nix
+  ];
+
   options.${namespace}.services.communication.matrix = {
     enable = mkEnableOption "Matrix server (Synapse)";
   };
@@ -24,7 +28,6 @@ in {
   config = mkIf cfg.enable {
     ${namespace}.services = {
       persistance.postgresql.enable = true;
-      # virtualisation.podman.enable = true;
 
       networking.caddy = {
         # globalConfig = ''
@@ -255,8 +258,29 @@ in {
         };
       };
 
+      # mautrix-starr = {
+      #   enable = true;
+      #   registerToSynapse = true;
+
+      #   settings = {
+      #     appservice = {
+      #       provisioning.enabled = false;
+      #     };
+
+      #     homeserver = {
+      #       address = "http://[::1]:${toString port}";
+      #       domain = domain;
+      #     };
+
+      #     bridge = {
+      #       permissions = {
+      #         "@chris:${domain}" = "admin";
+      #       };
+      #     };
+      #   };
+      # };
+
       postgresql = {
-        enable = true;
         ensureDatabases = [database];
         ensureUsers = [
           {
diff --git a/modules/nixos/services/media/servarr/default.nix b/modules/nixos/services/media/servarr/default.nix
index a98399d..ae0e3b0 100644
--- a/modules/nixos/services/media/servarr/default.nix
+++ b/modules/nixos/services/media/servarr/default.nix
@@ -129,11 +129,12 @@ in {
             port = 2007;
           };
 
-          postgresql = {
-            ensureDatabases = cfg |> lib.attrNames;
+          postgresql = let
+            databases = [] ++ (cfg |> lib.attrNames);
+          in {
+            ensureDatabases = databases;
             ensureUsers =
-              cfg
-              |> lib.attrNames
+              databases
               |> lib.map (service: {
                 name = service;
                 ensureDBOwnership = true;