diff --git a/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV1/README.md b/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV1/README.md
index 4cb1f40..2edd271 100644
--- a/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV1/README.md
+++ b/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV1/README.md
@@ -28,7 +28,7 @@ Note: "On New Failures" is an experimental option to reduce spam in case of a co
 
 **To/Cc** - You can add a fixed list of people who wants to recieve the email when the send mail condition is satisfied.
 
-![TaskConfig.png](images/TaskConfig.png)
+![TaskConfig.png](../../../images/TaskConfig.png)
 
 ### Configuring Email content
 
@@ -40,7 +40,7 @@ Note: "On New Failures" is an experimental option to reduce spam in case of a co
 
 **Include Commits** - Check this field to receive the commits information that are tested in the current release environment.
 
-![TaskConfig2.png](images/TaskConfig2.png)
+![TaskConfig2.png](../../../images/TaskConfig2.png)
 
 ### Advanced Section
 
@@ -50,11 +50,11 @@ Note: "On New Failures" is an experimental option to reduce spam in case of a co
 
 ### SMTP Connection 
 
-Create a "Generic" Service Connection in 'AzureDevOps' Service Connections with a Username, password and SMTP Server. Select the created endpoint from the dropdown menu in the task. 
+Create a "Generic" Service Connection in 'AzureDevOps' Service Connections with a Username, password and SMTP Server. Select the created endpoint from the dropdown menu in the task. SSL will be enabled by default.
 Try to use public SMTP servers - for example - “smtp.live.com” (Hotmail/Outlook.com).
 SMTP credentials generic endpoint can be configured as below for example:
-![GenericEndPoint.JPG](images/GenericEndPoint.png)
+![GenericEndPoint.JPG](../../../images/GenericEndPoint.png)
 
 ### Note
 
-Supports only Node 10.x 
\ No newline at end of file
+Supports only Node 10.x 
diff --git a/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV1/task.dev.json b/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV1/task.dev.json
index 7f6fc8b..56d2714 100644
--- a/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV1/task.dev.json
+++ b/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV1/task.dev.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 2,
-    "Patch": 208
+    "Patch": 209
   },
   "groups": [
     {
@@ -212,7 +212,7 @@
       "type": "boolean",
       "label": "Enable TLS",
       "required": false,
-      "defaultValue": "false",
+      "defaultValue": "true",
       "helpMarkDown": "Enables TLS on SMTP Connection for sending email.",
       "groupName": "advanced"
     },
diff --git a/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV1/task.json b/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV1/task.json
index d233845..5f6fc74 100644
--- a/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV1/task.json
+++ b/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV1/task.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 1,
-    "Patch": 8
+    "Patch": 9
   },
   "groups": [
     {
@@ -212,7 +212,7 @@
       "type": "boolean",
       "label": "Enable TLS",
       "required": false,
-      "defaultValue": "false",
+      "defaultValue": "true",
       "helpMarkDown": "Enables TLS on SMTP Connection for sending email.",
       "groupName": "advanced"
     },
diff --git a/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV2/README.md b/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV2/README.md
index 98f7f28..b0c90da 100644
--- a/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV2/README.md
+++ b/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV2/README.md
@@ -28,7 +28,7 @@ Note: "On New Failures" is an experimental option to reduce spam in case of a co
 
 **To/Cc** - You can add a fixed list of people who wants to recieve the email when the send mail condition is satisfied.
 
-![TaskConfig.png](images/TaskConfig.png)
+![TaskConfig.png](../../../images/TaskConfig.png)
 
 ### Configuring Email content
 
@@ -40,7 +40,7 @@ Note: "On New Failures" is an experimental option to reduce spam in case of a co
 
 **Include Commits** - Check this field to receive the commits information that are tested in the current release environment.
 
-![TaskConfig2.png](images/TaskConfig2.png)
+![TaskConfig2.png](../../../images/TaskConfig2.png)
 
 ### Advanced Section
 
@@ -50,11 +50,11 @@ Note: "On New Failures" is an experimental option to reduce spam in case of a co
 
 ### SMTP Connection 
 
-Create a "Generic" Service Connection in 'AzureDevOps' Service Connections with a Username, password and SMTP Server. Select the created endpoint from the dropdown menu in the task. 
+Create a "Generic" Service Connection in 'AzureDevOps' Service Connections with a Username, password and SMTP Server. Select the created endpoint from the dropdown menu in the task. SSL will be enabled by default.
 Try to use public SMTP servers - for example - “smtp.live.com” (Hotmail/Outlook.com).
 SMTP credentials generic endpoint can be configured as below for example:
-![GenericEndPoint.JPG](images/GenericEndPoint.png)
+![GenericEndPoint.JPG](../../../images/GenericEndPoint.png)
 
 ### Updates
 
-Supports Node 10.x - 16.x
\ No newline at end of file
+Supports Node 10.x - 16.x
diff --git a/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV2/task.dev.json b/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV2/task.dev.json
index 53b172a..03ea3a9 100644
--- a/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV2/task.dev.json
+++ b/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV2/task.dev.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 2,
-    "Patch": 208
+    "Patch": 209
   },
   "groups": [
     {
@@ -212,7 +212,7 @@
       "type": "boolean",
       "label": "Enable TLS",
       "required": false,
-      "defaultValue": "false",
+      "defaultValue": "true",
       "helpMarkDown": "Enables TLS on SMTP Connection for sending email.",
       "groupName": "advanced"
     },
diff --git a/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV2/task.json b/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV2/task.json
index bf21579..9b642ea 100644
--- a/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV2/task.json
+++ b/Extensions/emailReportTask/Tasks/emailReportTask/emailReportTaskV2/task.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 2,
     "Minor": 0,
-    "Patch": 0
+    "Patch": 1
   },
   "groups": [
     {
@@ -212,7 +212,7 @@
       "type": "boolean",
       "label": "Enable TLS",
       "required": false,
-      "defaultValue": "false",
+      "defaultValue": "true",
       "helpMarkDown": "Enables TLS on SMTP Connection for sending email.",
       "groupName": "advanced"
     },