diff --git a/config/ansible/tasks/servers/services/nextcloud/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/nextcloud/docker-compose.yml.j2
index 392a0b3..039149e 100644
--- a/config/ansible/tasks/servers/services/nextcloud/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/nextcloud/docker-compose.yml.j2
@@ -23,10 +23,13 @@ services:
     volumes:
       - {{nextcloud_data_dir}}/nextcloud-data:/var/www/html
     environment:
+      # Database settings
       - MYSQL_PASSWORD={{ lookup('community.general.onepassword', 'x5jporz6fguqsm4dmwrb6juua4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='MYSQL_PASSWORD') }}
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
       - MYSQL_HOST=db
+
+      # Storage settings
       - OBJECTSTORE_S3_BUCKET=nextcloud
       - OBJECTSTORE_S3_KEY={{hetzner_access_key}}
       - OBJECTSTORE_S3_SECRET={{hetzner_secret_key}}
@@ -35,6 +38,14 @@ services:
       - OBJECTSTORE_S3_SSL=true
       - OBJECTSTORE_S3_USEPATH_STYLE=true
       - OBJECTSTORE_S3_AUTOCREATE=true
+
+      # SMTP settings
+      - SMTP_HOST=smtp.fastmail.com
+      - SMTP_PORT=465
+      - MAIL_FROM_ADDRESS={{ lookup('community.general.onepassword', 'x5jporz6fguqsm4dmwrb6juua4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='MAIL_FROM_ADDRESS') }}
+      - MAIL_DOMAIN=mvl.sh
+      - SMTP_PASSWORD={{ lookup('community.general.onepassword', 'x5jporz6fguqsm4dmwrb6juua4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='SMTP_PASSWORD') }}
+
       - NEXTCLOUD_ADMIN_USER={{ lookup('community.general.onepassword', 'x5jporz6fguqsm4dmwrb6juua4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='username') }}
       - NEXTCLOUD_ADMIN_PASSWORD={{ lookup('community.general.onepassword', 'x5jporz6fguqsm4dmwrb6juua4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='password') }}
       - TRUSTED_PROXIES=172.20.0.0/24