diff --git a/modules/system/homelab/db.nix b/modules/system/homelab/db.nix
new file mode 100644
index 0000000..11cfedc
--- /dev/null
+++ b/modules/system/homelab/db.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  services.postgresql = {
+    enable = true;
+    dataDir = "/mnt/data/apps/postgresql"; 
+    package = pkgs.postgresql_16;
+  };
+}
\ No newline at end of file
diff --git a/modules/system/homelab/pass.nix b/modules/system/homelab/pass.nix
index 7c4e85d..028f99d 100644
--- a/modules/system/homelab/pass.nix
+++ b/modules/system/homelab/pass.nix
@@ -5,6 +5,7 @@
     backupDir = "/mnt/data/apps/vaultwarden/backups";
     environmentFile = "/mnt/data/apps/vaultwarden/.env";
     config = {
+      DATA_FOLDER = "/mnt/data/apps/vaultwarden/data";
       ROCKET_PORT = 8060;
       ROCKET_ADDRESS = "127.0.0.1";
       ROCKET_LOG = "critical";
diff --git a/modules/system/server.nix b/modules/system/server.nix
index b87b355..460c46a 100644
--- a/modules/system/server.nix
+++ b/modules/system/server.nix
@@ -22,6 +22,7 @@ in {
     ./homelab/dns.nix
     ./homelab/git.nix
     ./homelab/ai.nix
+    ./homelab/db.nix
     
     ./core/swapfile.nix
     ./core/oom.nix