diff --git a/.env.example b/.env.example
index 29eae7cbe..578aa0fa4 100644
--- a/.env.example
+++ b/.env.example
@@ -35,6 +35,7 @@ EMAIL_HOST_PASSWORD=""
 EMAIL_PORT=587
 EMAIL_FROM="Team Plane <team@mailer.plane.so>"
 EMAIL_USE_TLS="1"
+EMAIL_USE_SSL="0"
 
 # AWS Settings
 AWS_REGION=""
diff --git a/apiserver/plane/settings/common.py b/apiserver/plane/settings/common.py
index f5bff248b..2e0266159 100644
--- a/apiserver/plane/settings/common.py
+++ b/apiserver/plane/settings/common.py
@@ -179,6 +179,7 @@ EMAIL_PORT = int(os.environ.get("EMAIL_PORT", 587))
 EMAIL_HOST_USER = os.environ.get("EMAIL_HOST_USER")
 EMAIL_HOST_PASSWORD = os.environ.get("EMAIL_HOST_PASSWORD")
 EMAIL_USE_TLS = os.environ.get("EMAIL_USE_TLS", "1") == "1"
+EMAIL_USE_SSL = os.environ.get("EMAIL_USE_SSL", "0") == "1"
 EMAIL_FROM = os.environ.get("EMAIL_FROM", "Team Plane <team@mailer.plane.so>")
 
 
diff --git a/docker-compose.yml b/docker-compose.yml
index ec998ab76..da275a1fb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -38,6 +38,7 @@ services:
                         EMAIL_PORT: ${EMAIL_PORT}
                         EMAIL_FROM: ${EMAIL_FROM}
                         EMAIL_USE_TLS: ${EMAIL_USE_TLS}
+                        EMAIL_USE_SSL: ${EMAIL_USE_SSL}
                         AWS_REGION: ${AWS_REGION}
                         AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
                         AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
@@ -76,6 +77,7 @@ services:
                         EMAIL_PORT: ${EMAIL_PORT}
                         EMAIL_FROM: ${EMAIL_FROM}
                         EMAIL_USE_TLS: ${EMAIL_USE_TLS}
+                        EMAIL_USE_SSL: ${EMAIL_USE_SSL}
                         AWS_REGION: ${AWS_REGION}
                         AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
                         AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}