diff --git a/Tasks/AzureMysqlDeploymentV1/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureMysqlDeploymentV1/Strings/resources.resjson/en-US/resources.resjson
index 05e018dc6ba8..95b75e4502e7 100644
--- a/Tasks/AzureMysqlDeploymentV1/Strings/resources.resjson/en-US/resources.resjson
+++ b/Tasks/AzureMysqlDeploymentV1/Strings/resources.resjson/en-US/resources.resjson
@@ -60,6 +60,7 @@
   "loc.messages.WindowMysqlClientMissingError": "MySQL client is missing on the Windows agent machine. Please install it by running the MySQL client installer 'https://aka.ms/window-mysqlcli-installer' script file on the agent machine.",
   "loc.messages.LinuxMysqlClientMissingError": "MySQL client is missing on the Linux agent machine. Please install it by running 'sudo apt-get install mysql-client'.",
   "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not retrieve an access token for Azure. Status code: %s. Status message: %s",
-  "loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not retrieve an access token for the managed service principal. Please configure Managed Service Identity (MSI) for the virtual machine. See 'https://aka.ms/azure-msi-docs'. Status code: %s. Status message: %s",
-  "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not retrieve an access token for the managed service principal. Status code: %s. Status message: %s"
+  "loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not retrieve an access token for the managed service principal. Please configure Managed Service Identity (MSI) for the virtual machine. See 'https://aka.ms/azure-msi-docs'.Assign role to created MSI Identity. See 'https://aka.ms/assign-role-msi'. Status code: %s. Status message: %s",
+  "loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not retrieve an access token for the managed service principal. Status code: %s. Status message: %s",
+  "loc.messages.NotAbleToCreateFirewallRule": "Getting error during adding firewall rule to Azure mysql server. Error: %s"
 }
\ No newline at end of file
diff --git a/Tasks/AzureMysqlDeploymentV1/task.json b/Tasks/AzureMysqlDeploymentV1/task.json
index 91fefb975a9e..86b0620652e3 100644
--- a/Tasks/AzureMysqlDeploymentV1/task.json
+++ b/Tasks/AzureMysqlDeploymentV1/task.json
@@ -16,7 +16,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 12
+        "Patch": 13
     },
     "demands": [],
     "minimumAgentVersion": "1.100.0",
@@ -220,7 +220,8 @@
         "WindowMysqlClientMissingError": "MySQL client is missing on the Windows agent machine. Please install it by running the MySQL client installer 'https://aka.ms/window-mysqlcli-installer' script file on the agent machine.",
         "LinuxMysqlClientMissingError": "MySQL client is missing on the Linux agent machine. Please install it by running 'sudo apt-get install mysql-client'.",
         "CouldNotFetchAccessTokenforAzureStatusCode": "Could not retrieve an access token for Azure. Status code: %s. Status message: %s",
-        "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not retrieve an access token for the managed service principal. Please configure Managed Service Identity (MSI) for the virtual machine. See 'https://aka.ms/azure-msi-docs'. Status code: %s. Status message: %s",
-        "CouldNotFetchAccessTokenforMSIStatusCode": "Could not retrieve an access token for the managed service principal. Status code: %s. Status message: %s"
+        "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not retrieve an access token for the managed service principal. Please configure Managed Service Identity (MSI) for the virtual machine. See 'https://aka.ms/azure-msi-docs'.Assign role to created MSI Identity. See 'https://aka.ms/assign-role-msi'. Status code: %s. Status message: %s",
+        "CouldNotFetchAccessTokenforMSIStatusCode": "Could not retrieve an access token for the managed service principal. Status code: %s. Status message: %s",
+        "NotAbleToCreateFirewallRule": "Getting error during adding firewall rule to Azure mysql server. Error: %s"
     }
 }
\ No newline at end of file
diff --git a/Tasks/AzureMysqlDeploymentV1/task.loc.json b/Tasks/AzureMysqlDeploymentV1/task.loc.json
index f29365c63438..cd9ad26d9fde 100644
--- a/Tasks/AzureMysqlDeploymentV1/task.loc.json
+++ b/Tasks/AzureMysqlDeploymentV1/task.loc.json
@@ -16,7 +16,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 12
+    "Patch": 13
   },
   "demands": [],
   "minimumAgentVersion": "1.100.0",
@@ -221,6 +221,7 @@
     "LinuxMysqlClientMissingError": "ms-resource:loc.messages.LinuxMysqlClientMissingError",
     "CouldNotFetchAccessTokenforAzureStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforAzureStatusCode",
     "CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode",
-    "CouldNotFetchAccessTokenforMSIStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIStatusCode"
+    "CouldNotFetchAccessTokenforMSIStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIStatusCode",
+    "NotAbleToCreateFirewallRule": "ms-resource:loc.messages.NotAbleToCreateFirewallRule"
   }
 }
\ No newline at end of file
diff --git a/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson
index 2e90603e4ba3..11dabff0b4b8 100644
--- a/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson
+++ b/Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson
@@ -137,5 +137,6 @@
   "loc.messages.ASE_SSLIssueRecommendation": "To use a certificate in App Service, the certificate must be signed by a trusted certificate authority. If your web app gives you certificate validation errors, you're probably using a self-signed certificate and to resolve them you need to set a variable named VSTS_ARM_REST_IGNORE_SSL_ERRORS to the value true in the build or release definition",
   "loc.messages.FailedToGetAzureMetricAlerts": "Failed to get Azure metric alerts: %s. Error: %s",
   "loc.messages.FailedToUpdateAzureMetricAlerts": "Failed to update Azure metric alert rule '%s' Resource. Error: %s",
-  "loc.messages.ResponseNotValid": "Response is not in a valid format"
+  "loc.messages.ResponseNotValid": "Response is not in a valid format",
+  "loc.messages.NotAbleToCreateFirewallRule": "Getting error during adding firewall rule to Azure mysql server. Error: %s"
 }
\ No newline at end of file
diff --git a/Tasks/Common/azure-arm-rest/azure-arm-mysql.ts b/Tasks/Common/azure-arm-rest/azure-arm-mysql.ts
index 7266b398536f..f2c5b26877e0 100644
--- a/Tasks/Common/azure-arm-rest/azure-arm-mysql.ts
+++ b/Tasks/Common/azure-arm-rest/azure-arm-mysql.ts
@@ -100,7 +100,7 @@ export class FirewallRules {
                 deferred.reject(new azureServiceClient.ApiResult(azureServiceClient.ToError(response)));
             }
             else if(statusCode === 202){
-                this._recursiveGetCall(resourceGroupName, serverName, firewallRuleName, 3, 0).then((response) => {
+                this._recursiveGetCall(resourceGroupName, serverName, firewallRuleName, 5, 0).then((response) => {
                     deferred.resolve(new azureServiceClient.ApiResult(null, response));
                 },(error) => {
                     deferred.reject(error);
diff --git a/Tasks/Common/azure-arm-rest/module.json b/Tasks/Common/azure-arm-rest/module.json
index 82966645ff9f..e7bc13c2e804 100644
--- a/Tasks/Common/azure-arm-rest/module.json
+++ b/Tasks/Common/azure-arm-rest/module.json
@@ -138,6 +138,7 @@
         "ASE_SSLIssueRecommendation": "To use a certificate in App Service, the certificate must be signed by a trusted certificate authority. If your web app gives you certificate validation errors, you're probably using a self-signed certificate and to resolve them you need to set a variable named VSTS_ARM_REST_IGNORE_SSL_ERRORS to the value true in the build or release definition",
         "FailedToGetAzureMetricAlerts": "Failed to get Azure metric alerts: %s. Error: %s",
         "FailedToUpdateAzureMetricAlerts": "Failed to update Azure metric alert rule '%s' Resource. Error: %s",
-        "ResponseNotValid": "Response is not in a valid format"
+        "ResponseNotValid": "Response is not in a valid format",
+        "NotAbleToCreateFirewallRule": "Getting error during adding firewall rule to Azure mysql server. Error: %s"
     }
 }
\ No newline at end of file