diff --git a/home-manager.nix b/home-manager.nix
index 4c08ed3..5b016cf 100644
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -51,7 +51,7 @@
     git = {
       enable = true;
       userName = "Danilo Reyes";
-      userEmail = config.my.email;
+      userEmail = "CaptainJawZ@protonmail.com";
     };
   };
 }
diff --git a/modules/servers/nextcloud.nix b/modules/servers/nextcloud.nix
index ff92fd6..f49c47c 100644
--- a/modules/servers/nextcloud.nix
+++ b/modules/servers/nextcloud.nix
@@ -27,8 +27,8 @@ in {
       sops.secrets = {
         smtp-password = { };
         nextcloud-adminpass = {
-          owner = config.users.users.jawz.nextcloud;
-          inherit (config.users.users.jawz) group;
+          owner = config.users.users.nextcloud.name;
+          inherit (config.users.users.nextcloud) group;
         };
       };
       nixpkgs.config.permittedInsecurePackages =
diff --git a/modules/servers/vaultwarden.nix b/modules/servers/vaultwarden.nix
index 7d2b362..b883db5 100644
--- a/modules/servers/vaultwarden.nix
+++ b/modules/servers/vaultwarden.nix
@@ -8,7 +8,7 @@
           enable = true;
           dbBackend = "postgresql";
           package = pkgs.vaultwarden;
-          environmentFile = config.sops.vaultwarden.path;
+          environmentFile = config.sops.secrets.vaultwarden.path;
           config = {
             ROCKET_ADDRESS = "${config.my.localhost}";
             ROCKET_PORT = 8222;
@@ -23,9 +23,9 @@
             LOG_LEVEL = "warn";
             SMTP_HOST = config.my.localhost;
             SMTP_PORT = 25;
-            SMTP_SSL = false;
             SMTP_FROM = config.my.smtpemail;
-            SMTP_FROM_NAME = config.my.smtpemail;
+            SMTP_FROM_NAME = "Danilo Reyes";
+            SMTP_USERNAME = config.my.smtpemail;
           };
         };
         nginx = {
diff --git a/secrets/env.yaml b/secrets/env.yaml
index ef53996..ec5e175 100644
--- a/secrets/env.yaml
+++ b/secrets/env.yaml
@@ -3,7 +3,7 @@ ryot: ENC[AES256_GCM,data:Vlo6pv2+LuQxvdprI53BoQpngRfUWhqE07o+9ZKLZiaJBC6FCdFbeu
 mealie: ENC[AES256_GCM,data:RjKqDs70lWhGN0LXPp3feQfW/WtfJlR6vX++0hwGtqcA3iepEh2Ab/36YRKbsVRBkglp0u18MusTmP0LSHUpzgCn/c/5ZzzRLGL83K3aQRlg8JtdTvzvEnLQSdE=,iv:GEfa8LwpOhkqWtLk0I5F14zkHcnFjVhVaHeLSFlDkN4=,tag:lkGcFn91hVxraMHCKF7rXQ==,type:str]
 maloja: ENC[AES256_GCM,data:yCwokfD4I1Boy2NOhOTLA3dWgUVOdSzWKIEdYC0klvYu41IGcM8bM65uYFmiOtk+jHgt6j3kO/pBBlC4w/iTElphTqFyFRGdBN4fNRntAhMzqOszBZII,iv:Vf9hfNwSTBkh2cXV7Y2fv4NA8kng2M1i7BtTXJvy4u4=,tag:KLc8sP6N2/Pp/9069E3aPQ==,type:str]
 multi-scrobbler: ENC[AES256_GCM,data:4KENPA2BoCgBmlBkGrOzI7AOxwtpPjuBHi92XqbQzc3O7Wi6XHjcsAoeY3qWmH8MEB/QhZOh0jLWxJHwSFmHo8T3yG+KYCYzwjSD9c8CySrbwZZZ5S6G/qiQx4p1DDJv5KXk2SW/1gruKGEFgizk7qWpN0dUYgwnrBMjyeWu4UjuVZtrlWQoKRbsMA/8dbIzFuNTTu94E+IPZ8KFKkir13Odc3zROHdxfFZibVXndr40KVZBC4URruZLCT4pLPSHP0GqF69Z+cdI3VaMD5r/Ig==,iv:09d58aMTuFvtr7TMzGHoU8cu2IWHK++pYgLBkQDU0+U=,tag:TkF/a+jbptIr3ddBRN8PBQ==,type:str]
-vaultwarden: ENC[AES256_GCM,data:x1O0CEOVkwMBEZGppduQomKrc3oYQOUKQLo9Tp/NHdg1+TjyRHPGNfbqYLhbrFxWpokf2goZk70BkTOun9AgA5JUCbz8QgW/I44HC39m3hGABxeuHgfmmmkbqc6y4HMzxZWGqhbfkVKkJIdx8J9aJWxjjjK1/NeaXD0s49G9G6zeXeMA1Q0dZSrLw3orFUpnhwiMcc/qmQWoX8+8s9/WUg+/Jhbq/ig486AmXeayOv3xH7WNElv/8mqz5hvLMrDeKVFISNiV1xRvq8PsvbmgPdI6Vv7yIuu44LiqEFzrzgIbIj6ueBjiodd4jTf0tpqTpus8VV8QH/mtCdJodaHkHrI=,iv:xgIdZSUFi+bBBiDdAA2nLc7mXPSd2NG4Vz0tvZJ+Mpc=,tag:t3gnwb783Tub7cofG2Ppjg==,type:str]
+vaultwarden: ENC[AES256_GCM,data:Io1L71AnJZPYObiUo8cWzrrEw85smoZcFYPbTx6zxk1Dc0gq/tIAdtwB3724b3lJ2gOZoSe53nz5I9MmZis0fQsLca68Zbd9X4rjQKrWuyEcVThdky1ZMazTcotKUIt2rD+A9rQoban6JRhiNbXNsaz2kKIqHdKTBx4vfCFxKRHsbuwmsi59vA4HlVPROmpIlEdrP0juuc74ek+YAxhGF/PRc4l8G0OiW3uEcdSEh2kNc4mbzBA11G+4zveVR/6+LsAp7W5zGuyIQdaRyEn2W3t7LyVaSu+8eVDFo/tdHAH/NaMA9I8VKXpUE3FwaqmpzcR4xiZO5oKR1q8d4If75Q==,iv:Gj4oNaArrzXT0wfh8+lyB95ducTLZGoeNNQS3J9zI6g=,tag:F8MR3rokhmmhciFQ4a7XRw==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -46,8 +46,8 @@ sops:
             QXRUYWtGcWZCVW11U3VYRktuUjlCbDgKsTK4WhUza/JuoDTU3uATa6fq/8eYzxtb
             9BUK1ddzx9Mghea9XBMS17YGtGmW800OsLBomb3SINnOFvejcnKf8Q==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-06-25T01:05:24Z"
-    mac: ENC[AES256_GCM,data:hJZxqNIjxWM3FyKuzx1pU7c7kKElk/ptEs19uXnHU9GtCuWccys+kmCOU1Y/RbhBmBCTdnNUcWPisXniRIb38Zgh8qWRulUPcQV1qW7RnBaNqp9cK+GEUoTmYnw+QaSWmsOqskp39SMOuOyzIbpy1C55jRvPvJLyAk1MSMSCJ8Q=,iv:Bsl7u5SMLyX5F+TXbSlhJRTLNpsdsFoH0yFIJ5oID0M=,tag:49nZEnoleMZR1Z0rRwiRNw==,type:str]
+    lastmodified: "2024-06-25T01:28:50Z"
+    mac: ENC[AES256_GCM,data:02bA5o0vSucRLUfdR6D4/MTUt/2vuLfA/uAzCxZHiyYOmv+ojxlV2050h1AruA5a3XRbzUbEp2ZgFgSOJEQqlBENqKXxq2OTvP4/uasN50R8lfBW9YO3NeNj6IEKzs85Um+mHjlP6mK3z7JxPB4t+byOaDjsMeN7p5Zw0K2YLBA=,iv:ZkcyiNTIUUahzvvOmlAFiV/sToHBf/6b3a1d1f7InUQ=,tag:W2Qai1C3K3XJ9/MV8L6dDw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1