diff --git a/.env.example b/.env.example
index 746a5b9d7..a39da7045 100644
--- a/.env.example
+++ b/.env.example
@@ -34,6 +34,7 @@ EMAIL_HOST_USER=""
 EMAIL_HOST_PASSWORD=""
 EMAIL_PORT=587
 EMAIL_FROM="Team Plane <team@mailer.plane.so>"
+EMAIL_USE_TLS="1"
 
 # AWS Settings
 AWS_REGION=""
diff --git a/docker-compose-hub.yml b/docker-compose-hub.yml
index 9decf871e..14331532c 100644
--- a/docker-compose-hub.yml
+++ b/docker-compose-hub.yml
@@ -29,6 +29,7 @@ services:
                         EMAIL_HOST_PASSWORD: ${EMAIL_HOST_PASSWORD}
                         EMAIL_PORT: ${EMAIL_PORT}
                         EMAIL_FROM: ${EMAIL_FROM}
+                        EMAIL_USE_TLS: ${EMAIL_USE_TLS}
                         AWS_REGION: ${AWS_REGION}
                         AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
                         AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
@@ -62,6 +63,7 @@ services:
                         EMAIL_HOST_PASSWORD: ${EMAIL_HOST_PASSWORD}
                         EMAIL_PORT: ${EMAIL_PORT}
                         EMAIL_FROM: ${EMAIL_FROM}
+                        EMAIL_USE_TLS: ${EMAIL_USE_TLS}
                         AWS_REGION: ${AWS_REGION}
                         AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
                         AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
diff --git a/docker-compose.yml b/docker-compose.yml
index 1c5a80f15..5079d5379 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,6 +37,7 @@ services:
                         EMAIL_HOST_PASSWORD: ${EMAIL_HOST_PASSWORD}
                         EMAIL_PORT: ${EMAIL_PORT}
                         EMAIL_FROM: ${EMAIL_FROM}
+                        EMAIL_USE_TLS: ${EMAIL_USE_TLS}
                         AWS_REGION: ${AWS_REGION}
                         AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
                         AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
@@ -73,6 +74,7 @@ services:
                         EMAIL_HOST_PASSWORD: ${EMAIL_HOST_PASSWORD}
                         EMAIL_PORT: ${EMAIL_PORT}
                         EMAIL_FROM: ${EMAIL_FROM}
+                        EMAIL_USE_TLS: ${EMAIL_USE_TLS}
                         AWS_REGION: ${AWS_REGION}
                         AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
                         AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}