diff --git a/env.template b/env.template
index 43ff8df..ec9c062 100644
--- a/env.template
+++ b/env.template
@@ -8,7 +8,8 @@ ADMIN_USER=
 ADMIN_PASS=
 
 # used for sending notifications and reset passwords
-SMTP_HOST=
-SMTP_PORT=
+# only supports smtp+starttls
+SMTP_ADDR=
+SMTP_PORT=587
 SMTP_USER=
 SMTP_PASS=
diff --git a/services/auth.yaml b/services/auth.yaml
index de075a9..23093b1 100644
--- a/services/auth.yaml
+++ b/services/auth.yaml
@@ -15,7 +15,7 @@ services:
 
   zitadel:
     restart: 'unless-stopped'
-    image: 'ghcr.io/zitadel/zitadel:v2.24.10'
+    image: 'ghcr.io/zitadel/zitadel:v2.42.10'
     environment:
       ZITADEL_DATABASE_COCKROACH_HOST: crdb
       ZITADEL_EXTERNALSECURE: true
@@ -26,7 +26,7 @@ services:
       ZITADEL_FIRSTINSTANCE_ORG_HUMAN_USERNAME: ${ADMIN_USER}
       ZITADEL_FIRSTINSTANCE_ORG_HUMAN_PASSWORD: ${ADMIN_PASS}
 
-      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_HOST: "${SMTP_HOST}:${SMTP_PORT}"
+      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_HOST: "${SMTP_ADDR}:${SMTP_PORT}"
       ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_USER: ${SMTP_USER}
       ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_PASSWORD: ${SMTP_PASS}
       ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_SSL: true
diff --git a/services/git.yaml b/services/git.yaml
index 656c851..c78a1b4 100644
--- a/services/git.yaml
+++ b/services/git.yaml
@@ -22,10 +22,10 @@ services:
       GITEA__database__USER: gitea
       GITEA__database__PASSWD__FILE: /run/secrets/DB_PASSWD
       GITEA__mailer__ENABLED: true
-      GITEA__mailer__FROM: gitea
-      GITEA__mailer__MAILER_TYPE: smtp
-      GITEA__mailer__HOST: ${SMTP_HOST}
-      GITEA__mailer__IS_TLS_ENABLED: true
+      GITEA__mailer__FROM: gitea@mail.${DOMAIN}
+      GITEA__mailer__PROTOCOL: smtp+starttls
+      GITEA__mailer__SMTP_ADDR: ${SMTP_ADDR}
+      GITEA__mailer__SMTP_PORT: ${SMTP_PORT}
       GITEA__mailer__USER: ${SMTP_USER}
       GITEA__mailer__PASSWD: ${SMTP_PASS}
     restart: unless-stopped