diff --git a/templates/docker-compose.yaml.j2 b/templates/docker-compose.yaml.j2
index baea879..86ee29e 100644
--- a/templates/docker-compose.yaml.j2
+++ b/templates/docker-compose.yaml.j2
@@ -25,6 +25,7 @@ services:
     user: "{{ git_user.uid }}:{{ git_user.group }}"
     env_file: ./environment.env
     environment:
+      - GITEA__mailer__PASSWD={{ vault[inventory_hostname]['gitea']['mailer']['passwd'] | default('') }}
       - GITEA__database__DB_TYPE=mysql
       - GITEA__database__HOST=db:3306
       - GITEA__database__NAME=gitea
diff --git a/templates/environment.env.j2 b/templates/environment.env.j2
index 82c5518..8ec4ca6 100644
--- a/templates/environment.env.j2
+++ b/templates/environment.env.j2
@@ -59,9 +59,6 @@ GITEA__mailer__ENABLE_HELO={{ gitea_vars.mailer.enable_helo }}
 {% if 'user' in gitea_vars['mailer'] %}
 GITEA__mailer__USER={{ gitea_vars.mailer.user }}
 {% endif %}
-{% if 'passwd' in gitea_vars['mailer'] %}
-GITEA__mailer__PASSWD={{ gitea_vars.mailer.passwd }}
-{% endif %}
 {% endif %} {# /mailer #}
 
 {% if 'repository' in gitea_vars %}