diff --git a/docker-compose.yml b/docker-compose.yml
index 41476ae..3b5b881 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,13 +20,6 @@ services:
       DB_USERNAME: user
       DB_PASSWORD: password
       DB_CHARSET: "utf8mb4"
-      SMTP_FROMNAME: "Test"
-      SMTP_FROMADDRESS: "test@domain.tld"
-      SMTP_HOST: ""
-      SMTP_PORT: 587
-      SMTP_USERNAME: ""
-      SMTP_PASSWORD: ""
-      SMTP_ENCRYPTION: tls
     depends_on:
       - db
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index b173b1f..62fab59 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -14,6 +14,13 @@ DEFAULT_APP_OVERDUE_TASK_HOURS=10
 DEFAULT_APP_CRON_PW=$(openssl rand -base64 12)
 DEFAULT_APP_CRON_MAIL_LIMIT=5
 DEFAULT_LOG_ENABLE=true
+DEFAULT_SMTP_FROMNAME="Test"
+DEFAULT_SMTP_FROMADDRESS="test@domain.tld"
+DEFAULT_SMTP_HOST=""
+DEFAULT_SMTP_PORT=587
+DEFAULT_SMTP_USERNAME=""
+DEFAULT_SMTP_PASSWORD=""
+DEFAULT_SMTP_ENCRYPTION="tls"
 
 # Use environment variables if provided, otherwise use defaults
 ADMIN_EMAIL="${APP_ADMIN_EMAIL:-$DEFAULT_ADMIN_EMAIL}"
@@ -27,6 +34,13 @@ APP_OVERDUE_TASK_HOURS=${APP_OVERDUE_TASK_HOURS:-$DEFAULT_APP_OVERDUE_TASK_HOURS
 APP_CRON_PW="${APP_CRON_PW:-$DEFAULT_APP_CRON_PW}"
 APP_CRON_MAIL_LIMIT=${APP_CRON_MAIL_LIMIT:-$DEFAULT_APP_CRON_MAIL_LIMIT}
 LOG_ENABLE={$LOG_ENABLE:-$DEFAULT_LOG_ENABLE}
+SMTP_FROMNAME="${SMTP_FROMNAME:-$DEFAULT_SMTP_FROMNAME}"
+SMTP_FROMADDRESS="${SMTP_FROMADDRESS:-$DEFAULT_SMTP_FROMADDRESS}"
+SMTP_HOST="${SMTP_HOST:-$DEFAULT_SMTP_HOST}"
+SMTP_PORT=${SMTP_PORT:-$DEFAULT_SMTP_PORT}
+SMTP_USERNAME="${SMTP_USERNAME:-$DEFAULT_SMTP_USERNAME}"
+SMTP_PASSWORD="${SMTP_PASSWORD:-$DEFAULT_SMTP_PASSWORD}"
+SMTP_ENCRYPTION="${SMTP_ENCRYPTION:-$DEFAULT_SMTP_ENCRYPTION}"
 
 # Function to set PHP error reporting based on APP_DEBUG
 configure_php_error_reporting() {