diff --git a/.gitea/workflows/ci-prod.yml b/.gitea/workflows/ci-prod.yml
index 2a5994b..093682e 100644
--- a/.gitea/workflows/ci-prod.yml
+++ b/.gitea/workflows/ci-prod.yml
@@ -53,6 +53,7 @@ jobs:
           CAPTCHA_SITEKEY: ${{ secrets.CAPTCHA_SITEKEY }}
           MAIL_USERNAME: ${{ secrets.MAIL_USERNAME }}
           MAIL_PASSWORD: ${{ secrets.MAIL_PASSWORD }}
+          MAIL_FROM: ${{ secrets.MAIL_FROM }}
         run: |
           echo "POSTGRES_USER=${PROD_DB_USER:-myuser}" > .env
           echo "POSTGRES_PASSWORD=${PROD_DB_PASSWORD:-mypassword}" >> .env
@@ -65,6 +66,9 @@ jobs:
             echo "SPRING_MAIL_PASSWORD=${MAIL_PASSWORD}" >> .env
             echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=true" >> .env
             echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=true" >> .env
+            if [ -n "${MAIL_FROM}" ]; then
+              echo "APP_MAIL_FROM=${MAIL_FROM}" >> .env
+            fi
           fi
           docker compose down app || true
           docker compose up -d --build app
diff --git a/.gitea/workflows/ci-test.yml b/.gitea/workflows/ci-test.yml
index 5a71057..e60a840 100644
--- a/.gitea/workflows/ci-test.yml
+++ b/.gitea/workflows/ci-test.yml
@@ -49,6 +49,7 @@ jobs:
           DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
           MAIL_USERNAME: ${{ secrets.MAIL_USERNAME }}
           MAIL_PASSWORD: ${{ secrets.MAIL_PASSWORD }}
+          MAIL_FROM: ${{ secrets.MAIL_FROM }}
         run: |
           echo "POSTGRES_USER=${DB_USER:-myuser}" > .env
           echo "POSTGRES_PASSWORD=${DB_PASSWORD:-mypassword}" >> .env
@@ -61,6 +62,9 @@ jobs:
             echo "SPRING_MAIL_PASSWORD=${MAIL_PASSWORD}" >> .env
             echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=true" >> .env
             echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=true" >> .env
+            if [ -n "${MAIL_FROM}" ]; then
+              echo "APP_MAIL_FROM=${MAIL_FROM}" >> .env
+            fi
           fi
           docker compose down app || true
           docker compose up -d --build app
diff --git a/as-talange-core/src/main/java/com/astalange/core/service/PaiementEmailService.java b/as-talange-core/src/main/java/com/astalange/core/service/PaiementEmailService.java
index 84e35c0..de65f04 100644
--- a/as-talange-core/src/main/java/com/astalange/core/service/PaiementEmailService.java
+++ b/as-talange-core/src/main/java/com/astalange/core/service/PaiementEmailService.java
@@ -28,7 +28,7 @@ public class PaiementEmailService {
     private final JavaMailSender mailSender;
     private final PaiementRepository paiementRepository;
 
-    @Value("${spring.mail.username:noreply@as-talange.fr}")
+    @Value("${app.mail.from:${spring.mail.username:noreply@as-talange.fr}}")
     private String fromEmail = "noreply@as-talange.fr";
 
     public PaiementEmailService(@Autowired(required = false) JavaMailSender mailSender,
diff --git a/as-talange-core/src/main/java/com/astalange/core/service/SportEasyEmailService.java b/as-talange-core/src/main/java/com/astalange/core/service/SportEasyEmailService.java
index 8a127e4..c0f6e3e 100644
--- a/as-talange-core/src/main/java/com/astalange/core/service/SportEasyEmailService.java
+++ b/as-talange-core/src/main/java/com/astalange/core/service/SportEasyEmailService.java
@@ -30,7 +30,7 @@ public class SportEasyEmailService {
     @Value("${sporteasy.base-url:https://www.sporteasy.net/join/}")
     private String sportEasyBaseUrl;
 
-    @Value("${spring.mail.username:noreply@as-talange.fr}")
+    @Value("${app.mail.from:${spring.mail.username:noreply@as-talange.fr}}")
     private String fromEmail;
 
     public SportEasyEmailService(LicenceRepository licenceRepository,
diff --git a/docker-compose.yml b/docker-compose.yml
index af7aabf..1520ecc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -49,6 +49,7 @@ services:
       - SPRING_MAIL_PASSWORD=${SPRING_MAIL_PASSWORD:-}
       - SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=${SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH:-false}
       - SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=${SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE:-false}
+      - APP_MAIL_FROM=${APP_MAIL_FROM:-}
       - CAPTCHA_SITEKEY=${CAPTCHA_SITEKEY:-}
       - CAPTCHA_SECRET=${CAPTCHA_SECRET:-}
     depends_on: