diff --git a/configurations/nixos/defiant/configuration.nix b/configurations/nixos/defiant/configuration.nix
index 9be3065..a309704 100644
--- a/configurations/nixos/defiant/configuration.nix
+++ b/configurations/nixos/defiant/configuration.nix
@@ -308,6 +308,7 @@
 
     panoramax = {
       enable = true;
+      openFirewall = true;
     };
 
     qbittorrent = {
diff --git a/modules/nixos-modules/server/panoramax/database.nix b/modules/nixos-modules/server/panoramax/database.nix
new file mode 100644
index 0000000..3cf3455
--- /dev/null
+++ b/modules/nixos-modules/server/panoramax/database.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  config,
+  ...
+}: {
+  config = lib.mkIf config.services.panoramax.enable (lib.mkMerge [
+    {
+      host = {
+        postgres = {
+          enable = true;
+        };
+      };
+    }
+    (lib.mkIf config.host.postgres.enable {
+      host = {
+        postgres = {
+          extraUsers = {
+            ${config.services.panoramax.database.user} = {
+              isClient = true;
+            };
+          };
+          extraDatabases = {
+            ${config.services.panoramax.database.name} = {};
+          };
+        };
+      };
+    })
+  ]);
+}
diff --git a/modules/nixos-modules/server/panoramax/default.nix b/modules/nixos-modules/server/panoramax/default.nix
index f029ee3..4c6b9ea 100644
--- a/modules/nixos-modules/server/panoramax/default.nix
+++ b/modules/nixos-modules/server/panoramax/default.nix
@@ -4,5 +4,6 @@
     ./fail2ban.nix
     ./impermanence.nix
     ./panoramax.nix
+    ./database.nix
   ];
 }