diff --git a/.env.sample b/.env.sample
index f9c0283..ea303f8 100644
--- a/.env.sample
+++ b/.env.sample
@@ -42,7 +42,10 @@ VIKUNJA_AUTH_LOCAL_ENABLED=false
 # COMPOSE_FILE="${COMPOSE_FILE}:compose.smtp.yml"
 # VIKUNJA_MAILER_ENABLED=true
 # VIKUNJA_MAILER_HOST=mail.example.com
+# VIKUNJA_MAILER_PORT=25
 # VIKUNJA_MAILER_AUTHTYPE=plain # possible: plain, login, cram-md5
 # VIKUNJA_MAILER_USERNAME=user
 # VIKUNJA_MAILER_FROMEMAIL=user@example.com
-# SECRET_SMTP_PASSWORD_VERSION=v1
+# VIKUNJA_MAILER_SKIPTLSVERIFY=false
+# VIKUNJA_MAILER_FORCESSL=false
+# SECRET_SMTP_PASSWORD_VERSION=v1
\ No newline at end of file
diff --git a/compose.smtp.yml b/compose.smtp.yml
index 777ec06..fef6032 100644
--- a/compose.smtp.yml
+++ b/compose.smtp.yml
@@ -3,11 +3,15 @@ version: "3.8"
 services:
   app:
     environment:
-      - SMTP_ENABLED
-      - SMTP_HOST
-      - SMTP_AUTHTYPE
-      - SMTP_USER
-      - SMTP_FROM_EMAIL
+      - VIKUNJA_MAILER_ENABLED
+      - VIKUNJA_MAILER_HOST
+      - VIKUNJA_MAILER_PORT
+      - VIKUNJA_MAILER_AUTHTYPE
+      - VIKUNJA_MAILER_SKIPTLSVERIFY
+      - VIKUNJA_MAILER_FORCESSL
+      - VIKUNJA_MAILER_USERNAME
+      - VIKUNJA_MAILER_PASSWORD_FILE=/run/secrets/smtp_password
+      - VIKUNJA_MAILER_FROMEMAIL
       
     secrets:
       - smtp_password
diff --git a/compose.yml b/compose.yml
index 8e4f74a..988d411 100644
--- a/compose.yml
+++ b/compose.yml
@@ -21,12 +21,6 @@ services:
       - VIKUNJA_CACHE_TYPE=redis
       - VIKUNJA_SERVICE_ENABLEREGISTRATION=false
       - VIKUNJA_SERVICE_JWTTTL=604800
-      - VIKUNJA_MAILER_ENABLED
-      - VIKUNJA_MAILER_HOST
-      - VIKUNJA_MAILER_AUTHTYPE
-      - VIKUNJA_MAILER_USERNAME
-      - VIKUNJA_MAILER_PASSWORD_FILE=/run/secrets/smtp_password
-      - VIKUNJA_MAILER_FROMEMAIL
       - VIKUNJA_LOG_LEVEL
       - VIKUNJA_LOG_DATABASE
       - VIKUNJA_LOG_DATABASELEVEL