diff --git a/.gitea/workflows/ci-prod.yml b/.gitea/workflows/ci-prod.yml
index e601f79..2a5994b 100644
--- a/.gitea/workflows/ci-prod.yml
+++ b/.gitea/workflows/ci-prod.yml
@@ -60,7 +60,7 @@ jobs:
           echo "CAPTCHA_SITEKEY=${CAPTCHA_SITEKEY:-1x00000000000000000000AA}" >> .env
           if [ -n "${MAIL_USERNAME}" ]; then
             echo "SPRING_MAIL_HOST=smtp-relay.brevo.com" >> .env
-            echo "SPRING_MAIL_PORT=587" >> .env
+            echo "SPRING_MAIL_PORT=${MAIL_PORT:-2525}" >> .env
             echo "SPRING_MAIL_USERNAME=${MAIL_USERNAME}" >> .env
             echo "SPRING_MAIL_PASSWORD=${MAIL_PASSWORD}" >> .env
             echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=true" >> .env
diff --git a/.gitea/workflows/ci-test.yml b/.gitea/workflows/ci-test.yml
index 73216a0..5a71057 100644
--- a/.gitea/workflows/ci-test.yml
+++ b/.gitea/workflows/ci-test.yml
@@ -56,7 +56,7 @@ jobs:
           echo "CAPTCHA_SITEKEY=1x00000000000000000000AA" >> .env
           if [ -n "${MAIL_USERNAME}" ]; then
             echo "SPRING_MAIL_HOST=smtp-relay.brevo.com" >> .env
-            echo "SPRING_MAIL_PORT=587" >> .env
+            echo "SPRING_MAIL_PORT=${MAIL_PORT:-2525}" >> .env
             echo "SPRING_MAIL_USERNAME=${MAIL_USERNAME}" >> .env
             echo "SPRING_MAIL_PASSWORD=${MAIL_PASSWORD}" >> .env
             echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=true" >> .env
diff --git a/as-talange-web/src/main/resources/application.yml b/as-talange-web/src/main/resources/application.yml
index f7934bf..f535f19 100644
--- a/as-talange-web/src/main/resources/application.yml
+++ b/as-talange-web/src/main/resources/application.yml
@@ -28,6 +28,9 @@ spring:
           auth: ${SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH:false}
           starttls:
             enable: ${SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE:false}
+          connectiontimeout: ${SPRING_MAIL_PROPERTIES_MAIL_SMTP_CONNECTIONTIMEOUT:5000}
+          timeout: ${SPRING_MAIL_PROPERTIES_MAIL_SMTP_TIMEOUT:5000}
+          writetimeout: ${SPRING_MAIL_PROPERTIES_MAIL_SMTP_WRITETIMEOUT:5000}
 
 server:
   port: 8080