diff --git a/configurations/nixos/defiant/configuration.nix b/configurations/nixos/defiant/configuration.nix
index 9be3065..d10bea0 100644
--- a/configurations/nixos/defiant/configuration.nix
+++ b/configurations/nixos/defiant/configuration.nix
@@ -307,7 +307,8 @@
     };
 
     panoramax = {
-      enable = true;
+      enable = false;
+      openFirewall = true;
     };
 
     qbittorrent = {
diff --git a/modules/common-modules/pkgs/default.nix b/modules/common-modules/pkgs/default.nix
index e608350..c97f97c 100644
--- a/modules/common-modules/pkgs/default.nix
+++ b/modules/common-modules/pkgs/default.nix
@@ -10,7 +10,6 @@
         ./webtoon-dl.nix
         {};
     })
-    # TODO: this package always needs to be called with the --in-process-gpu flag for some reason, can we automate that?
     (final: prev: {
       prostudiomasters =
         pkgs.callPackage
diff --git a/modules/common-modules/pkgs/prostudiomasters.nix b/modules/common-modules/pkgs/prostudiomasters.nix
index c1c03fe..1a3ad01 100644
--- a/modules/common-modules/pkgs/prostudiomasters.nix
+++ b/modules/common-modules/pkgs/prostudiomasters.nix
@@ -1,6 +1,7 @@
 {
   fetchurl,
   appimageTools,
+  writeShellScript,
 }: let
   pname = "prostudiomasters";
   version = "2.5.6";
@@ -8,7 +9,25 @@
     url = "https://download.prostudiomasters.com/linux/ProStudioMasters-${version}.AppImage";
     hash = "sha256-7owOwdcucFfl+JsVj+Seau2KOz0J4P/ep7WrBSNSmbs=";
   };
-in
-  appimageTools.wrapType2 {
+
+  # Create the base AppImage wrapper
+  baseApp = appimageTools.wrapType2 {
     inherit pname version src;
-  }
+  };
+
+  # Create a wrapper script that automatically adds the --in-process-gpu flag
+  wrapper = writeShellScript "prostudiomasters-wrapper" ''
+    exec ${baseApp}/bin/prostudiomasters --in-process-gpu "$@"
+  '';
+in
+  # Override the base app to use our wrapper script
+  baseApp.overrideAttrs (oldAttrs: {
+    buildCommand =
+      oldAttrs.buildCommand
+      + ''
+        # Replace the original binary with our wrapper
+        rm $out/bin/prostudiomasters
+        cp ${wrapper} $out/bin/prostudiomasters
+        chmod +x $out/bin/prostudiomasters
+      '';
+  })
diff --git a/modules/nixos-modules/server/panoramax/database.nix b/modules/nixos-modules/server/panoramax/database.nix
new file mode 100644
index 0000000..8679f9a
--- /dev/null
+++ b/modules/nixos-modules/server/panoramax/database.nix
@@ -0,0 +1,34 @@
+{
+  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;
+                createUser = true;
+              };
+            };
+            extraDatabases = {
+              ${config.services.panoramax.database.name} = {
+                name = config.services.panoramax.database.user;
+              };
+            };
+          };
+        };
+      }
+    )
+  ]);
+}
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
   ];
 }
diff --git a/modules/nixos-modules/server/panoramax/panoramax.nix b/modules/nixos-modules/server/panoramax/panoramax.nix
index 2af9982..fd77db7 100644
--- a/modules/nixos-modules/server/panoramax/panoramax.nix
+++ b/modules/nixos-modules/server/panoramax/panoramax.nix
@@ -206,12 +206,6 @@
             # Core Flask configuration
             FLASK_APP = "geovisio";
 
-            # Database configuration
-            DB_HOST = config.services.panoramax.database.host;
-            DB_PORT = toString config.services.panoramax.database.port;
-            DB_USERNAME = config.services.panoramax.database.user;
-            DB_NAME = config.services.panoramax.database.name;
-
             # Storage configuration
             FS_URL = config.services.panoramax.settings.storage.fsUrl;
 
@@ -224,6 +218,18 @@
             # Python path to include the panoramax package
             PYTHONPATH = "${config.services.panoramax.package}/${pkgs.python3.sitePackages}";
           }
+          // (
+            if config.services.panoramax.database.host == "/run/postgresql"
+            then {
+              DB_URL = "postgresql://${config.services.panoramax.database.user}@/${config.services.panoramax.database.name}?host=/run/postgresql";
+            }
+            else {
+              DB_HOST = config.services.panoramax.database.host;
+              DB_PORT = toString config.services.panoramax.database.port;
+              DB_USERNAME = config.services.panoramax.database.user;
+              DB_NAME = config.services.panoramax.database.name;
+            }
+          )
           // (lib.optionalAttrs (config.services.panoramax.settings.flask.secretKey != null) {
             FLASK_SECRET_KEY = config.services.panoramax.settings.flask.secretKey;
           })