diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix
index c40cb08..d6c2136 100644
--- a/modules/nixos/hardware/default.nix
+++ b/modules/nixos/hardware/default.nix
@@ -20,6 +20,7 @@
   config = lib.mkMerge [
     {
       services.fwupd.enable = true;
+      environment.persistence."/persist".directories = lib.singleton "/var/lib/bluetooth";
       hardware.bluetooth = {
         enable = true;
         settings.General.Experimental = true;
diff --git a/modules/nixos/server/databases/default.nix b/modules/nixos/server/databases/default.nix
index 640d587..d060cd9 100644
--- a/modules/nixos/server/databases/default.nix
+++ b/modules/nixos/server/databases/default.nix
@@ -17,9 +17,28 @@ in
       enable = lib.mkEnableOption "the MySQL server";
       port = lib.pantheon.mkPortOption 3306;
     };
+    postgresql = {
+      enable = lib.mkEnableOption "the postgresql server";
+      port = lib.pantheon.mkPortOption 5432;
+    };
   };
 
   config = lib.mkMerge [
+    (lib.mkIf cfg.postgresql.enable {
+      networking.firewall.allowedTCPPorts = lib.singleton cfg.postgresql.port;
+      services.postgresql = {
+        enable = true;
+        enableTCPIP = true;
+        inherit (cfg.postgresql) port;
+        authentication = lib.mkOverride 10 ''
+          #type database DBuser auth-method
+          local all all trust
+
+          # ipv4
+          host all all 0.0.0.0/32 trust
+        '';
+      };
+    })
     (lib.mkIf cfg.mongodb.enable {
       networking.firewall.allowedTCPPorts = [ cfg.mongodb.port ];
       environment.persistence."/persist".directories = [
diff --git a/systems/x86_64-linux/apollo/default.nix b/systems/x86_64-linux/apollo/default.nix
index 0170ec9..7a2c393 100644
--- a/systems/x86_64-linux/apollo/default.nix
+++ b/systems/x86_64-linux/apollo/default.nix
@@ -24,6 +24,7 @@
     mountHelios = true;
     databases.mongodb.enable = true;
     databases.mysql.enable = true;
+    databases.postgresql.enable = true;
     web-apps.librechat.enable = true;
     web-servers.nginx.enable = true;
     web-servers.nginx.proxies = [