diff --git a/templates/opt/gitea/home/app.ini.j2 b/templates/opt/gitea/home/app.ini.j2
index f96e297..3cb1474 100755
--- a/templates/opt/gitea/home/app.ini.j2
+++ b/templates/opt/gitea/home/app.ini.j2
@@ -10,7 +10,7 @@ USER     = {{ gitea_db.user }}
 PASSWD   = `{{ gitea_db.pass }}`
 SCHEMA   = 
 SSL_MODE = disable
-CHARSET  = utf8
+CHARSET  = utf8mb4
 PATH     = {{ gitea_data_location }}/data/gitea.db
 LOG_SQL  = false
 
@@ -37,7 +37,8 @@ PATH = {{ gitea_data_location }}/data/lfs
 ENABLED        = {{ gitea_mail }}
 FROM           = {{ gitea_mail_from }}
 PROTOCOL       = {{ gitea_mail_type }}
-SMTP_ADDR      = {{ gitea_mail_domain }}:{{ gitea_mail_port }}
+SMTP_ADDR      = {{ gitea_mail_domain }}
+SMTP_PORT      = {{ gitea_mail_port }}
 USER           = {{ gitea_mail_user }}
 PASSWD         = `{{ gitea_mail_pass }}`