diff --git a/configurations/nixos/defiant/configuration.nix b/configurations/nixos/defiant/configuration.nix
index d10bea0..9be3065 100644
--- a/configurations/nixos/defiant/configuration.nix
+++ b/configurations/nixos/defiant/configuration.nix
@@ -307,8 +307,7 @@
     };
 
     panoramax = {
-      enable = false;
-      openFirewall = true;
+      enable = true;
     };
 
     qbittorrent = {
diff --git a/modules/common-modules/pkgs/default.nix b/modules/common-modules/pkgs/default.nix
index c97f97c..e608350 100644
--- a/modules/common-modules/pkgs/default.nix
+++ b/modules/common-modules/pkgs/default.nix
@@ -10,6 +10,7 @@
         ./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 1a3ad01..c1c03fe 100644
--- a/modules/common-modules/pkgs/prostudiomasters.nix
+++ b/modules/common-modules/pkgs/prostudiomasters.nix
@@ -1,7 +1,6 @@
 {
   fetchurl,
   appimageTools,
-  writeShellScript,
 }: let
   pname = "prostudiomasters";
   version = "2.5.6";
@@ -9,25 +8,7 @@
     url = "https://download.prostudiomasters.com/linux/ProStudioMasters-${version}.AppImage";
     hash = "sha256-7owOwdcucFfl+JsVj+Seau2KOz0J4P/ep7WrBSNSmbs=";
   };
-
-  # 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
-      '';
-  })
+  appimageTools.wrapType2 {
+    inherit pname version src;
+  }
diff --git a/modules/nixos-modules/server/panoramax/database.nix b/modules/nixos-modules/server/panoramax/database.nix
deleted file mode 100644
index 8679f9a..0000000
--- a/modules/nixos-modules/server/panoramax/database.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  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 4c6b9ea..f029ee3 100644
--- a/modules/nixos-modules/server/panoramax/default.nix
+++ b/modules/nixos-modules/server/panoramax/default.nix
@@ -4,6 +4,5 @@
     ./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 fd77db7..2af9982 100644
--- a/modules/nixos-modules/server/panoramax/panoramax.nix
+++ b/modules/nixos-modules/server/panoramax/panoramax.nix
@@ -206,6 +206,12 @@
             # 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;
 
@@ -218,18 +224,6 @@
             # 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;
           })