diff --git a/modules/nixos/services/forgejo/default.nix b/modules/nixos/services/forgejo/default.nix
index 18538be..0f3dfc5 100644
--- a/modules/nixos/services/forgejo/default.nix
+++ b/modules/nixos/services/forgejo/default.nix
@@ -83,11 +83,7 @@ in
         # I configure my backup system manually below.
         dump.enable = false;
 
-        secrets = {
-          mailer = lib.mkIf cfg.mail.enable {
-            PASSWD = cfg.mail.passwordFile;
-          };
-        };
+        mailerPasswordFile = lib.mkIf cfg.mail.enable cfg.mail.passwordFile;
 
         settings = {
           DEFAULT = {
diff --git a/modules/nixos/services/mealie/default.nix b/modules/nixos/services/mealie/default.nix
index 96b9e14..55ac376 100644
--- a/modules/nixos/services/mealie/default.nix
+++ b/modules/nixos/services/mealie/default.nix
@@ -35,8 +35,12 @@ in
 
         # Use PostgreSQL
         DB_ENGINE = "postgres";
-        # Make it work with socket auth
-        POSTGRES_URL_OVERRIDE = "postgresql://mealie:@/mealie?host=/run/postgresql";
+        POSTGRES_USER = "mealie";
+        POSTGRES_PASSWORD = "";
+        POSTGRES_SERVER = "/run/postgresql";
+        # Pydantic and/or mealie doesn't handle the URI correctly, hijack it
+        # with query parameters...
+        POSTGRES_DB = "mealie?host=/run/postgresql&dbname=mealie";
       };
     };