diff --git a/modules/server/biggoron/default.nix b/modules/server/biggoron/default.nix
index 4d73594..4fd5842 100644
--- a/modules/server/biggoron/default.nix
+++ b/modules/server/biggoron/default.nix
@@ -12,6 +12,18 @@ in
     settings.AcceptEnv = "GIT_PROTOCOL";
   };
 
+  # Fixing mailing issues
+  systemd.services.forgejo.serviceConfig = {
+    RestrictAddressFamilies = [
+      "AF_LOCAL"
+      "AF_NETLINK"
+    ];
+    ReadWritePaths = [ "/var/spool/mail/" "/var/lib/postfix/queue/maildrop/" ];
+    NoNewPrivileges = lib.mkForce false;
+    PrivateUsers = lib.mkForce false;
+    SystemCallFilter = lib.mkForce [];
+  };
+
   services.forgejo = {
     enable = true;
 
@@ -52,9 +64,8 @@ in
       mailer = {
         ENABLED = true;
         PROTOCOL = "sendmail";
-        # SMTP_ADDR = "taf.lyes.eu";
-        # FROM = "noreply@${srv.DOMAIN}";
-        # USER = "noreply@${srv.DOMAIN}";
+        FROM = "root-biggoron@lyes.eu";
+        SENDMAIL_PATH = "${config.security.wrapperDir}/sendmail";
       };
 
       # oauth2_client = {
diff --git a/modules/server/default.nix b/modules/server/default.nix
index e6f4fca..b122e24 100644
--- a/modules/server/default.nix
+++ b/modules/server/default.nix
@@ -16,7 +16,7 @@
   boot.swraid = {
     enable = true;
     mdadmConf = ''
-      MAILADDR root@lyes.eu
+      MAILADDR root-mdadm@lyes.eu
       DEVICE partitions
     '';
   };