diff --git a/deploy.sh b/deploy.sh
index fa410bc..eb58831 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -608,7 +608,7 @@ nix_generation() {
   echo -e "\n✅ Writing correct ips to configuration.nix..."
   envsubst '$HOME_SERVER_IP $HOME_ROUTER_IP $TARGET_INTERFACE' <final-nix-config/etc/nixos/misc/networking.nix > final-nix-config/etc/nixos/misc/networking.nix.tmp
   mv final-nix-config/etc/nixos/misc/networking.nix.tmp final-nix-config/etc/nixos/misc/networking.nix
-  envsubst '$DOMAIN_NAME $EMAIL_ADDRESS $SENDER_EMAIL_DOMAIN $SENDER_EMAIL_ADDRESS' <final-nix-config/etc/nixos/misc/mail.nix > final-nix-config/etc/nixos/misc/mail.nix.tmp
+  envsubst '${DOMAIN_NAME} ${EMAIL_ADDRESS} ${SENDER_EMAIL_DOMAIN} ${SENDER_EMAIL_ADDRESS}' <final-nix-config/etc/nixos/misc/mail.nix > final-nix-config/etc/nixos/misc/mail.nix.tmp
   mv final-nix-config/etc/nixos/misc/mail.nix.tmp final-nix-config/etc/nixos/misc/mail.nix
   envsubst '$PODMAN_NETWORKS' <final-nix-config/etc/nixos/misc/activation.nix > final-nix-config/etc/nixos/misc/activation.nix.tmp
   mv final-nix-config/etc/nixos/misc/activation.nix.tmp final-nix-config/etc/nixos/misc/activation.nix
diff --git a/templates/nix-config/misc/mail.nix b/templates/nix-config/misc/mail.nix
index 2e0d051..d23e13f 100644
--- a/templates/nix-config/misc/mail.nix
+++ b/templates/nix-config/misc/mail.nix
@@ -44,7 +44,7 @@ in
         from = config.email.fromAddress;
         user = config.email.smtpUsername;
         tls = true;
-        passwordeval = "\${pkgs.coreutils}/bin/cat \${config.email.smtpPasswordPath}";
+        passwordeval = "${pkgs.coreutils}/bin/cat ${config.email.smtpPasswordPath}";
       };
     };
   };