diff --git a/roles/forgejo/defaults/main.yml b/roles/forgejo/defaults/main.yml
index 09a244b..bf8aa53 100644
--- a/roles/forgejo/defaults/main.yml
+++ b/roles/forgejo/defaults/main.yml
@@ -17,7 +17,8 @@ forgejo_app_admin_username: Myforgejousername # can not be set to admin in Forge
 forgejo_app_admin_password: Myforgejopassword
 forgejo_app_admin_email: myadmin@mydomain.mytld
 
-# forgejo_smtp_host: domain.com:port
+# forgejo_smtp_addr: domain.com
+# forgejo_smtp_port: 465
 # forgejo_smtp_username: my@username.com
 # forgejo_smtp_password: <password>
 # forgejo_smtp_force_tls: false # forces tls if it is on a non-traditional tls port. Overwrites starttls so should generally be off
diff --git a/roles/forgejo/templates/docker-stack.yml.j2 b/roles/forgejo/templates/docker-stack.yml.j2
index 5bad7af..ba5618b 100644
--- a/roles/forgejo/templates/docker-stack.yml.j2
+++ b/roles/forgejo/templates/docker-stack.yml.j2
@@ -29,12 +29,13 @@ services:
 {% if forgejo_app_admin_username is not undefined and not None and forgejo_app_admin_password is not undefined and not None %}
       - FORGEJO__security__INSTALL_LOCK=true
 {% endif %}
-{% if forgejo_smtp_host is not undefined and not None and forgejo_smtp_username is not undefined and not None and forgejo_smtp_password is not undefined and not None %}
+{% if forgejo_smtp_addr is not undefined and not None and forgejo_smtp_port is not undefined and not None and forgejo_smtp_username is not undefined and not None and forgejo_smtp_password is not undefined and not None %}
       - FORGEJO__mailer__ENABLED=true
       - FORGEJO__service__ENABLE_NOTIFY_MAIL=true
       - FORGEJO__mailer__FROM=forgejo@{{ server_domain }}
       - FORGEJO__mailer__TYPE=smtp
-      - FORGEJO__mailer__HOST={{ forgejo_smtp_host }}
+      - FORGEJO__mailer__SMTP_ADDR={{ forgejo_smtp_addr }}
+      - FORGEJO__mailer__SMTP_PORT={{ forgejo_smtp_port }}
       - FORGEJO__mailer__IS_TLS_ENABLED={{ (forgejo_smtp_force_tls is not undefined and not None) | ternary(forgejo_smtp_force_tls,'false') }}
       - FORGEJO__mailer__USER={{ forgejo_smtp_username }}
       - FORGEJO__mailer__PASSWD={{ forgejo_smtp_password }}