diff --git a/nextcloud/docker-compose.smtp.yml b/nextcloud/docker-compose.smtp.yml
index 60136d8..25809d8 100644
--- a/nextcloud/docker-compose.smtp.yml
+++ b/nextcloud/docker-compose.smtp.yml
@@ -4,14 +4,14 @@ services:
   nextcloud-fpm:
     environment:
       &smtp-configuration
-      NC_mail_smtphost: ${NC_mail_smtphost:?err} # The hostname of the SMTP server.
-      NC_mail_smtpsecure: ${NC_mail_smtpsecure:-ssl} # Set to ssl to use SSL, or tls to use STARTTLS.
-      NC_mail_smtpport: ${NC_mail_smtpport:-465}
-      NC_mail_smtpauthtype: ${NC_mail_smtpauthtype:-LOGIN}
-      NC_mail_smtpname: ${NC_mail_smtpname:?err}
-      NC_mail_smtppassword: ${NC_mail_smtppassword:?err}
-      NC_mail_from_address: ${NC_mail_from_address:?err}
-      NC_mail_domain: ${NC_mail_domain:?err}
+      SMTP_HOST: ${SMTP_HOST:?err}
+      SMTP_SECURE: ${SMTP_SECURE:-ssl}
+      SMTP_PORT: ${SMTP_PORT:-465}
+      SMTP_AUTHTYPE: ${SMTP_AUTHTYPE:-LOGIN}
+      SMTP_NAME: ${SMTP_NAME:?err}
+      SMTP_PASSWORD: ${SMTP_PASSWORD:?err}
+      MAIL_FROM_ADDRESS: ${MAIL_FROM_ADDRESS:?err}
+      MAIL_DOMAIN: ${MAIL_DOMAIN:?err}
 
   nextcloud-cron:
     environment: