diff --git a/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson
index 32b2c80e6bd7..edf1bd0f8709 100644
--- a/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson
+++ b/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson
@@ -190,5 +190,6 @@
   "loc.messages.PackageDeploymentInitiated": "Package deployment using ZIP Deploy initiated.",
   "loc.messages.FailedToGetDeploymentLogs": "Failed to get deployment logs. Error: %s",
   "loc.messages.GoExeNameNotPresent": "Go exe name is not present",
-  "loc.messages.WarDeploymentRetry": "Retrying war file deployment as it did not expand successfully earlier."
+  "loc.messages.WarDeploymentRetry": "Retrying war file deployment as it did not expand successfully earlier.",
+  "loc.messages.Updatemachinetoenablesecuretlsprotocol": "Make sure the machine is using TLS 1.2 protocol or higher. Check https://aka.ms/enableTlsv2 for more information on how to enable TLS in your machine."
 }
\ No newline at end of file
diff --git a/Tasks/AzureRmWebAppDeployment/task.json b/Tasks/AzureRmWebAppDeployment/task.json
index 48a891915fb1..694278cfce4e 100644
--- a/Tasks/AzureRmWebAppDeployment/task.json
+++ b/Tasks/AzureRmWebAppDeployment/task.json
@@ -17,7 +17,7 @@
     "version": {
         "Major": 4,
         "Minor": 0,
-        "Patch": 3
+        "Patch": 4
     },
     "releaseNotes": "What's new in version 4.* (preview)<br />Supports Kudu Zip Deploy<br />Supports App Service Environments<br />Improved UI for discovering different App service types supported by the task<br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more Information.",
     "minimumAgentVersion": "2.104.1",
@@ -531,6 +531,7 @@
         "PackageDeploymentInitiated": "Package deployment using ZIP Deploy initiated.",
         "FailedToGetDeploymentLogs": "Failed to get deployment logs. Error: %s",
         "GoExeNameNotPresent": "Go exe name is not present",
-        "WarDeploymentRetry": "Retrying war file deployment as it did not expand successfully earlier."
+        "WarDeploymentRetry": "Retrying war file deployment as it did not expand successfully earlier.",
+        "Updatemachinetoenablesecuretlsprotocol" : "Make sure the machine is using TLS 1.2 protocol or higher. Check https://aka.ms/enableTlsv2 for more information on how to enable TLS in your machine."
     }
 }
diff --git a/Tasks/AzureRmWebAppDeployment/task.loc.json b/Tasks/AzureRmWebAppDeployment/task.loc.json
index 502164ba09d3..88e1c43aea5a 100644
--- a/Tasks/AzureRmWebAppDeployment/task.loc.json
+++ b/Tasks/AzureRmWebAppDeployment/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 4,
     "Minor": 0,
-    "Patch": 3
+    "Patch": 4
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "minimumAgentVersion": "2.104.1",
@@ -542,6 +542,7 @@
     "PackageDeploymentInitiated": "ms-resource:loc.messages.PackageDeploymentInitiated",
     "FailedToGetDeploymentLogs": "ms-resource:loc.messages.FailedToGetDeploymentLogs",
     "GoExeNameNotPresent": "ms-resource:loc.messages.GoExeNameNotPresent",
-    "WarDeploymentRetry": "ms-resource:loc.messages.WarDeploymentRetry"
+    "WarDeploymentRetry": "ms-resource:loc.messages.WarDeploymentRetry",
+    "Updatemachinetoenablesecuretlsprotocol": "ms-resource:loc.messages.Updatemachinetoenablesecuretlsprotocol"
   }
 }
\ No newline at end of file
diff --git a/Tasks/Common/webdeployment-common/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Common/webdeployment-common/Strings/resources.resjson/en-US/resources.resjson
new file mode 100644
index 000000000000..377effffde18
--- /dev/null
+++ b/Tasks/Common/webdeployment-common/Strings/resources.resjson/en-US/resources.resjson
@@ -0,0 +1,3 @@
+{
+  "loc.messages.Updatemachinetoenablesecuretlsprotocol": "Make sure the machine is using TLS 1.2 protocol or higher. Check https://aka.ms/enableTlsv2 for more information on how to enable TLS in your machine."
+}
\ No newline at end of file
diff --git a/Tasks/Common/webdeployment-common/module.json b/Tasks/Common/webdeployment-common/module.json
new file mode 100644
index 000000000000..a9f463f4a502
--- /dev/null
+++ b/Tasks/Common/webdeployment-common/module.json
@@ -0,0 +1,5 @@
+{
+    "messages":{
+        "Updatemachinetoenablesecuretlsprotocol" : "Make sure the machine is using TLS 1.2 protocol or higher. Check https://aka.ms/enableTlsv2 for more information on how to enable TLS in your machine."
+    }
+}
\ No newline at end of file
diff --git a/Tasks/Common/webdeployment-common/msdeployutility.ts b/Tasks/Common/webdeployment-common/msdeployutility.ts
index 00c734e61c97..248d16b20203 100644
--- a/Tasks/Common/webdeployment-common/msdeployutility.ts
+++ b/Tasks/Common/webdeployment-common/msdeployutility.ts
@@ -195,6 +195,9 @@ export function redirectMSDeployErrorToConsole() {
             else if(errorFileContent.indexOf("FILE_IN_USE") !== -1) {
                 tl.warning(tl.loc("Trytodeploywebappagainwithrenamefileoptionselected"));
             }
+            else if(errorFileContent.indexOf("transport connection") != -1){
+                errorFileContent = errorFileContent + tl.loc("Updatemachinetoenablesecuretlsprotocol");
+            }
           
             tl.error(errorFileContent);
         }
diff --git a/Tasks/IISWebAppDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson b/Tasks/IISWebAppDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson
index 89fa486cf3e4..c4ea91f493fe 100644
--- a/Tasks/IISWebAppDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson
+++ b/Tasks/IISWebAppDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson
@@ -72,5 +72,6 @@
   "loc.messages.FailedToApplyTransformationReason1": "1. Whether the Transformation is already applied for the MSBuild generated package during build. If yes, remove the <DependentUpon> tag for each config in the csproj file and rebuild. ",
   "loc.messages.FailedToApplyTransformationReason2": "2. Ensure that the config file and transformation files are present in the same folder inside the package.",
   "loc.messages.AutoParameterizationMessage": "ConnectionString attributes in Web.config is parameterized by default. Note that the transformation has no effect on connectionString attributes as the value is overridden during deployment by 'Parameters.xml or 'SetParameters.xml' files. You can disable the auto-parameterization by setting /p:AutoParameterizationWebConfigConnectionStrings=False during MSBuild package generation.",
-  "loc.messages.PackageDeploymentFailed": "Failed to deploy web package to IIS website."
+  "loc.messages.PackageDeploymentFailed": "Failed to deploy web package to IIS website.",
+  "loc.messages.Updatemachinetoenablesecuretlsprotocol": "Make sure the machine is using TLS 1.2 protocol or higher. Check https://aka.ms/enableTlsv2 for more information on how to enable TLS in your machine."
 }
\ No newline at end of file
diff --git a/Tasks/IISWebAppDeploymentOnMachineGroup/task.json b/Tasks/IISWebAppDeploymentOnMachineGroup/task.json
index 025b179891e3..cb81d5bcbd69 100644
--- a/Tasks/IISWebAppDeploymentOnMachineGroup/task.json
+++ b/Tasks/IISWebAppDeploymentOnMachineGroup/task.json
@@ -15,7 +15,7 @@
     "version": {
         "Major": 0,
         "Minor": 0,
-        "Patch": 35
+        "Patch": 36
     },
     "demands": [],
     "minimumAgentVersion": "2.104.1",
@@ -179,6 +179,7 @@
         "FailedToApplyTransformationReason1": "1. Whether the Transformation is already applied for the MSBuild generated package during build. If yes, remove the <DependentUpon> tag for each config in the csproj file and rebuild. ",
         "FailedToApplyTransformationReason2": "2. Ensure that the config file and transformation files are present in the same folder inside the package.",
         "AutoParameterizationMessage": "ConnectionString attributes in Web.config is parameterized by default. Note that the transformation has no effect on connectionString attributes as the value is overridden during deployment by 'Parameters.xml or 'SetParameters.xml' files. You can disable the auto-parameterization by setting /p:AutoParameterizationWebConfigConnectionStrings=False during MSBuild package generation.",
-        "PackageDeploymentFailed": "Failed to deploy web package to IIS website."
+        "PackageDeploymentFailed": "Failed to deploy web package to IIS website.",
+        "Updatemachinetoenablesecuretlsprotocol" : "Make sure the machine is using TLS 1.2 protocol or higher. Check https://aka.ms/enableTlsv2 for more information on how to enable TLS in your machine."
     }
 }
\ No newline at end of file
diff --git a/Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json b/Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json
index 5316b76c4577..92ada32aea18 100644
--- a/Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json
+++ b/Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json
@@ -15,7 +15,7 @@
   "version": {
     "Major": 0,
     "Minor": 0,
-    "Patch": 35
+    "Patch": 36
   },
   "demands": [],
   "minimumAgentVersion": "2.104.1",
@@ -181,6 +181,7 @@
     "FailedToApplyTransformationReason1": "ms-resource:loc.messages.FailedToApplyTransformationReason1",
     "FailedToApplyTransformationReason2": "ms-resource:loc.messages.FailedToApplyTransformationReason2",
     "AutoParameterizationMessage": "ms-resource:loc.messages.AutoParameterizationMessage",
-    "PackageDeploymentFailed": "ms-resource:loc.messages.PackageDeploymentFailed"
+    "PackageDeploymentFailed": "ms-resource:loc.messages.PackageDeploymentFailed",
+    "Updatemachinetoenablesecuretlsprotocol": "ms-resource:loc.messages.Updatemachinetoenablesecuretlsprotocol"
   }
 }
\ No newline at end of file