diff --git a/modules/system/services/server/fileserver/nextcloud/default.nix b/modules/system/services/server/fileserver/nextcloud/default.nix
index 3e34e1d..b614efe 100644
--- a/modules/system/services/server/fileserver/nextcloud/default.nix
+++ b/modules/system/services/server/fileserver/nextcloud/default.nix
@@ -20,7 +20,7 @@
       mail_domain = "${config.domains.p1}";
       mail_from_address = "noreply";
       mail_smtpauth = "true";
-      mail_smtpname = "noreply@${config.domains.p1}";
+      mail_smtpname = "noreply@${config.domains.p2}";
       mail_smtppassword = config.secrets.noreplyPassword;
       mail_smtpmode = "smtp";
       mail_smtpport = 587;
diff --git a/modules/system/services/server/forgejo/default.nix b/modules/system/services/server/forgejo/default.nix
index 1efee67..1419859 100644
--- a/modules/system/services/server/forgejo/default.nix
+++ b/modules/system/services/server/forgejo/default.nix
@@ -16,8 +16,8 @@
         mailer = {
           ENABLED = true;
           SMTP_ADDR = "mx.${config.domains.p1}";
-          FROM = "NixFox Git <noreply@${config.domains.p1}>";
-          USER = "noreply@${config.domains.p1}";
+          FROM = "NixFox Git <noreply@${config.domains.p2}>";
+          USER = "noreply@${config.domains.p2}";
           PASSWD = config.secrets.noreplyPassword;
           PROTOCOL = "smtps";
         };
diff --git a/modules/system/services/server/mailserver/simplenix/default.nix b/modules/system/services/server/mailserver/simplenix/default.nix
index fdd6014..20aca2a 100644
--- a/modules/system/services/server/mailserver/simplenix/default.nix
+++ b/modules/system/services/server/mailserver/simplenix/default.nix
@@ -18,16 +18,9 @@
     localDnsResolver = false;
     redis.port = 1515;
 
-    dmarcReporting = {
-      enable = true;
-      domain = "${config.domains.p1}";
-      localpart = "noreply";
-      organizationName = "Jimbo's Files";
-    };
-        
     # Passwords made with 'mkpasswd -sm bcrypt'
     loginAccounts = {
-      "noreply@${config.domains.p1}" = {
+      "noreply@${config.domains.p2}" = {
         hashedPasswordFile = pkgs.writeText "noreply" config.secrets.noreplyMailHash;
         sendOnly = true;
       };    
@@ -38,12 +31,11 @@
           "james@${config.domains.p1}"
           "james@${config.domains.p2}"
 
-	  "vicee@${config.domains.p2}"
+          "vicee@${config.domains.p2}"
           "vice@${config.domains.p2}"
           "yara@${config.domains.p2}"
           "yaralis@${config.domains.p2}"
 
-          "contact@${config.domains.p1}"
           "contact@${config.domains.p2}"
         ];
       };
diff --git a/modules/system/services/server/nginx/rtmp/default.nix b/modules/system/services/server/nginx/rtmp/default.nix
index 6975268..5f30a19 100644
--- a/modules/system/services/server/nginx/rtmp/default.nix
+++ b/modules/system/services/server/nginx/rtmp/default.nix
@@ -23,7 +23,7 @@
               live on;
               allow play all;
               hls on;
-              hls_path /var/www/Jimbo-Landing-Page/streams/hls/;
+              hls_path /var/www/landing-page/streams/hls/;
               hls_fragment_naming system;
               hls_fragment 3;
               hls_playlist_length 40;
diff --git a/modules/system/services/server/social/mastodon/default.nix b/modules/system/services/server/social/mastodon/default.nix
index 1776bcf..2f1f068 100644
--- a/modules/system/services/server/social/mastodon/default.nix
+++ b/modules/system/services/server/social/mastodon/default.nix
@@ -10,8 +10,8 @@
       host = "mx.${config.domains.p1}";
       port = 587;
       authenticate = true;
-      fromAddress = "Jimbo's Mastodon <noreply@${config.domains.p1}>";
-      user = "noreply@${config.domains.p1}";
+      fromAddress = "NixFox Mastodon <noreply@${config.domains.p2}>";
+      user = "noreply@${config.domains.p2}";
       passwordFile = pkgs.writeText "smtp_pass.txt" config.secrets.noreplyPassword;
     };
   };
diff --git a/modules/system/services/server/social/matrix/synapse/default.nix b/modules/system/services/server/social/matrix/synapse/default.nix
index 88c61f6..661b205 100644
--- a/modules/system/services/server/social/matrix/synapse/default.nix
+++ b/modules/system/services/server/social/matrix/synapse/default.nix
@@ -29,9 +29,9 @@
       ];
 
       email = {
-        notif_from = "NixFox Matrix <noreply@${config.domains.p1}>";
+        notif_from = "NixFox Matrix <noreply@${config.domains.p2}>";
         smtp_host = "mx.${config.domains.p1}";
-        smtp_user = "noreply@${config.domains.p1}";
+        smtp_user = "noreply@${config.domains.p2}";
         smtp_pass = config.secrets.noreplyPassword;
         enable_tls = true;
         smtp_port = 587;
diff --git a/modules/system/services/server/vaultwarden/default.nix b/modules/system/services/server/vaultwarden/default.nix
index 2bcaec9..729ff55 100644
--- a/modules/system/services/server/vaultwarden/default.nix
+++ b/modules/system/services/server/vaultwarden/default.nix
@@ -13,9 +13,9 @@
 
       # Smtp email
       SMTP_HOST = "mx.${config.domains.p1}";
-      SMTP_FROM = "noreply@${config.domains.p1}";
+      SMTP_FROM = "noreply@${config.domains.p2}";
       SMTP_FROM_NAME = "Vaultwarden";
-      SMTP_USERNAME = "noreply@${config.domains.p1}";
+      SMTP_USERNAME = "noreply@${config.domains.p2}";
       SMTP_PASSWORD = config.secrets.noreplyPassword;
       SMTP_SECURITY = "starttls";
       SMTP_PORT = 587;