diff --git a/gitea/.env.example b/gitea/.env.example
index 9b50c19..c630244 100644
--- a/gitea/.env.example
+++ b/gitea/.env.example
@@ -1,3 +1,5 @@
 TRAEFIK_HOST=dev.example.com
 NETWORK_NAME=falcon_network
 RUNNER_TOKEN=change_me
+EMAIL_FROM=gitea@pivoine.art
+EMAIL_USER=Gitea
diff --git a/gitea/compose.yml b/gitea/compose.yml
index ec7ce63..65ca25b 100644
--- a/gitea/compose.yml
+++ b/gitea/compose.yml
@@ -25,7 +25,8 @@ services:
       GITEA__mailer__PROTOCOL: smtp
       GITEA__mailer__SMTP_ADDR: mailpit
       GITEA__mailer__SMTP_PORT: 1025
-      GITEA__mailer__FROM: "Gitea <gitea@pivoine.art>"
+      GITEA__mailer__FROM: ${EMAIL_FROM}
+      GITEA__mailer__USER: ${EMAIL_USER}
       GITEA__service__DISABLE_REGISTRATION: "true"
       GITEA__service__REQUIRE_SIGNIN_VIEW: "false"
       GITEA__service__ENABLE_NOTIFY_MAIL: "true"
diff --git a/passbolt/.env.example b/passbolt/.env.example
index cf04f31..e4cac62 100644
--- a/passbolt/.env.example
+++ b/passbolt/.env.example
@@ -1,2 +1,4 @@
 TRAEFIK_HOST=passbolt.example.com
 NETWORK_NAME=falcon_network
+EMAIL_FROM=passbolt@pivoine.art
+EMAIL_USER=Passbolt
diff --git a/passbolt/compose.yml b/passbolt/compose.yml
index 8fd9d12..3bab33d 100644
--- a/passbolt/compose.yml
+++ b/passbolt/compose.yml
@@ -18,8 +18,8 @@ services:
       EMAIL_TRANSPORT_DEFAULT_HOST: mailpit
       EMAIL_TRANSPORT_DEFAULT_PORT: "1025"
       EMAIL_TRANSPORT_DEFAULT_TLS: "false"
-      EMAIL_DEFAULT_FROM: passbolt@pivoine.art
-      EMAIL_DEFAULT_FROM_NAME: Passbolt
+      EMAIL_DEFAULT_FROM: ${EMAIL_FROM}
+      EMAIL_DEFAULT_FROM_NAME: ${EMAIL_USER}
     volumes:
       - ../.data/passbolt/gpg:/etc/passbolt/gpg
       - ../.data/passbolt/jwt:/etc/passbolt/jwt