diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 7297d1e..810d11e 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -36,6 +36,6 @@ spring.mail.properties.mail.smtp.auth=${MAIL_SMTP_AUTH:false}
 spring.mail.properties.mail.smtp.starttls.enable=${MAIL_SMTP_STARTTLS:false}
 
 # Application Mail Settings
-app.mail.from=${APP_MAIL_FROM:noreply@printcalculator.local}
+app.mail.from=${APP_MAIL_FROM:${MAIL_USERNAME:noreply@printcalculator.local}}
 app.mail.admin.enabled=${APP_MAIL_ADMIN_ENABLED:true}
 app.mail.admin.address=${APP_MAIL_ADMIN_ADDRESS:admin@printcalculator.local}
diff --git a/docker-compose.deploy.yml b/docker-compose.deploy.yml
index da3d8cc..912b2c1 100644
--- a/docker-compose.deploy.yml
+++ b/docker-compose.deploy.yml
@@ -13,6 +13,15 @@ services:
       - CLAMAV_HOST=${CLAMAV_HOST}
       - CLAMAV_PORT=${CLAMAV_PORT}
       - CLAMAV_ENABLED=${CLAMAV_ENABLED}
+      - MAIL_HOST=${MAIL_HOST:-mail.infomaniak.com}
+      - MAIL_PORT=${MAIL_PORT:-587}
+      - MAIL_USERNAME=${MAIL_USERNAME:-info@3d-fab.ch}
+      - MAIL_PASSWORD=${MAIL_PASSWORD:-}
+      - MAIL_SMTP_AUTH=${MAIL_SMTP_AUTH:-true}
+      - MAIL_SMTP_STARTTLS=${MAIL_SMTP_STARTTLS:-true}
+      - APP_MAIL_FROM=${APP_MAIL_FROM:-info@3d-fab.ch}
+      - APP_MAIL_ADMIN_ENABLED=${APP_MAIL_ADMIN_ENABLED:-true}
+      - APP_MAIL_ADMIN_ADDRESS=${APP_MAIL_ADMIN_ADDRESS:-info@3d-fab.ch}
       - TEMP_DIR=/app/temp
       - PROFILES_DIR=/app/profiles
     restart: always