diff --git a/deploy.sh b/deploy.sh
index b113f41..07e56a2 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -606,13 +606,13 @@ nix_generation() {
   cp -avu templates/nix-config/misc/* final-nix-config/etc/nixos/misc/
 
   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
+  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
+  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
-  envsubst '$TRAEFIK_NETWORKS $TRAEFIK_REF_NETWORKS' < final-nix-config/etc/nixos/podman/traefik.nix > final-nix-config/etc/nixos/podman/traefik.nix.tmp
+  envsubst \$TRAEFIK_NETWORKS,\$TRAEFIK_REF_NETWORKS <final-nix-config/etc/nixos/podman/traefik.nix > final-nix-config/etc/nixos/podman/traefik.nix.tmp
   mv final-nix-config/etc/nixos/podman/traefik.nix.tmp final-nix-config/etc/nixos/podman/traefik.nix
   if [[ "${TARGET_TPM}" == "true" ]]; then
     sed -i "s|#  boot.initrd.systemd.tpm2.enable = true;|  boot.initrd.systemd.tpm2.enable = true;|" final-nix-config/etc/nixos/configuration.nix
diff --git a/templates/nix-config/misc/mail.nix b/templates/nix-config/misc/mail.nix
index 46a1a5c..d23e13f 100644
--- a/templates/nix-config/misc/mail.nix
+++ b/templates/nix-config/misc/mail.nix
@@ -21,12 +21,12 @@ in
     smtpServer = lib.mkOption {
       description = "The SMTP server address";
       type = lib.types.str;
-      default = "$SENDER_MAIL_DOMAIN";
+      default = "$SENDER_EMAIL_DOMAIN";
     };
     smtpUsername = lib.mkOption {
       description = "The SMTP username";
       type = lib.types.str;
-      default = "$SENDER_MAIL_ADDRESS";
+      default = "$SENDER_EMAIL_ADDRESS";
     };
     smtpPasswordPath = lib.mkOption {
       description = "Path to the secret containing SMTP password";