diff --git a/deploy.sh b/deploy.sh
index 650e1ce..693d418 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -380,8 +380,8 @@ services_generation() {
       PODMAN_NETWORKS+="    \${pkgs.podman}/bin/podman network create --driver=bridge --subnet=172.16.${j}0.0/24 --ip-range=172.16.${j}0.0/24 --gateway=172.16.${j}0.254 ${service}_frontend"$'\n'
       TRAEFIK_NETWORKS+="              ${service}_frontend:"$'\n'
       TRAEFIK_NETWORKS+="                ipv4_address: 172.16.${j}0.253"$'\n'
-      TRAEFIK_NETWORKS_REF+="          ${service}_frontend:"$'\n'
-      TRAEFIK_NETWORKS_REF+="            external: true"$'\n'
+      TRAEFIK_REF_NETWORKS+="          ${service}_frontend:"$'\n'
+      TRAEFIK_REF_NETWORKS+="            external: true"$'\n'
     fi
     if [[ "${service}" == "frigate" ]]; then
       local FRIGATE_DEVICES_BLOCK=""
@@ -438,7 +438,7 @@ services_generation() {
 
   export PODMAN_NETWORKS
   export TRAEFIK_NETWORKS
-  export TRAEFIK_NETWORKS_REF
+  export TRAEFIK_REF_NETWORKS
 }
 
 disks_generation() {
@@ -585,11 +585,11 @@ nix_generation() {
   sed -i "s|TARGET_INTERFACE|${TARGET_INTERFACE}|g" final-nix-config/etc/nixos/misc/networking.nix
   sed -i "s|DOMAIN_NAME|${DOMAIN_NAME}|g" final-nix-config/etc/nixos/misc/mail.nix
   sed -i "s|EMAIL_ADDRESS|${EMAIL_ADDRESS}|g" final-nix-config/etc/nixos/misc/mail.nix
-  sed -i "s|TARGET_INTERFACE|${SENDER_EMAIL_DOMAIN}|g" final-nix-config/etc/nixos/misc/mail.nix
-  sed -i "s|TARGET_INTERFACE|${SENDER_EMAIL_ADDRESS}|g" final-nix-config/etc/nixos/misc/mail.nix
+  sed -i "s|SENDER_MAIL_DOMAIN|${SENDER_EMAIL_DOMAIN}|g" final-nix-config/etc/nixos/misc/mail.nix
+  sed -i "s|SENDER_MAIL_ADDRESS|${SENDER_EMAIL_ADDRESS}|g" final-nix-config/etc/nixos/misc/mail.nix
   sed -i "s|PODMAN_NETWORKS|${PODMAN_NETWORKS//$'\n'/\\n}|" final-nix-config/etc/nixos/misc/activation.nix
   sed -i "s|TRAEFIK_NETWORKS|${TRAEFIK_NETWORKS//$'\n'/\\n}|" final-nix-config/etc/nixos/podman/traefik.nix
-  sed -i "s|TRAEFIK_NETWORKS_REF|${TRAEFIK_NETWORKS_REF//$'\n'/\\n}|" final-nix-config/etc/nixos/podman/traefik.nix
+  sed -i "s|TRAEFIK_NETWORKS_REF|${TRAEFIK_REF_NETWORKS//$'\n'/\\n}|" 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
   fi
diff --git a/templates/nix-config/misc/mail.nix b/templates/nix-config/misc/mail.nix
index 46f7357..5e7397d 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_EMAIL_DOMAIN";
+      default = "SENDER_MAIL_DOMAIN";
     };
     smtpUsername = lib.mkOption {
       description = "The SMTP username";
       type = lib.types.str;
-      default = "SENDER_EMAIL_ADDRESS";
+      default = "SENDER_MAIL_ADDRESS";
     };
     smtpPasswordPath = lib.mkOption {
       description = "Path to the secret containing SMTP password";
diff --git a/templates/nix-config/podman/traefik.nix b/templates/nix-config/podman/traefik.nix
index bd5fe8d..44c6c31 100644
--- a/templates/nix-config/podman/traefik.nix
+++ b/templates/nix-config/podman/traefik.nix
@@ -39,7 +39,7 @@ TRAEFIK_NETWORKS
               - traefik.http.routers.traefik-https.tls.certresolver=cloudflare
             restart: always
         networks:
-TRAEFIK_NETWORKS_REF
+TRAEFIK_REF_NETWORKS
       '';
 
     systemd.services.traefik = {