diff --git a/azure-pipelines/templates/get-tool-versions-steps.yml b/azure-pipelines/templates/get-tool-versions-steps.yml
index 2c6fcd6..4dae6fc 100644
--- a/azure-pipelines/templates/get-tool-versions-steps.yml
+++ b/azure-pipelines/templates/get-tool-versions-steps.yml
@@ -9,9 +9,7 @@ steps:
         -DistURL "$(DIST_URL)" `
         -ManifestLink "$(MANIFEST_URL)" `
         -VersionFilterToInclude $(INCLUDE_FILTER) `
-        -VersionFilterToExclude $(EXCLUDE_FILTER) `
-        -RetryIntervalSec $(INTERVAL_SEC) `
-        -RetryCount $(RETRY_COUNT)
+        -VersionFilterToExclude $(EXCLUDE_FILTER)
 
 - task: PowerShell@2
   displayName: 'Cancel build'
@@ -22,22 +20,18 @@ steps:
       Import-Module "./azure-devops/azure-devops-api.ps1"
       $azureDevOpsApi = Get-AzureDevOpsApi -TeamFoundationCollectionUri $(System.TeamFoundationCollectionUri) `
                                            -ProjectName $(System.TeamProject) `
-                                           -AccessToken $(System.AccessToken) `
-                                           -RetryCount $(INTERVAL_SEC) `
-                                           -RetryIntervalSec $(RETRY_COUNT)
+                                           -AccessToken $(System.AccessToken)
 
       $AzureDevOpsApi.UpdateBuildStatus($(Build.BuildId), 'Cancelling') | Out-Null
 
 - task: PowerShell@2
-  displayName: 'Set env variables'
+  displayName: 'Set env variable'
   condition: and(succeeded(), ne(variables['Get_versions.TOOL_VERSIONS'], ''))
   inputs:
     TargetType: inline
     script: |
       $PipelineUrl = "$(System.TeamFoundationCollectionUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId)"
       Write-Output "##vso[task.setvariable variable=PIPELINE_URL]$PipelineUrl"
-      $toolVersion = "$(Get_versions.TOOL_VERSIONS)".Replace(",",", ")
-      Write-Output "##vso[task.setvariable variable=TOOL_VERSIONS]$toolVersion"
 
 - task: PowerShell@2
   displayName: 'Send Slack notification'
@@ -48,6 +42,6 @@ steps:
     arguments: |
       -Url "$(SLACK_CHANNEL_URL)" `
       -ToolName "$(TOOL_NAME)" `
-      -ToolVersion "$(TOOL_VERSIONS)" `
+      -ToolVersion "$(Get_versions.TOOL_VERSIONS)" `
       -PipelineUrl "$(PIPELINE_URL)" `
       -ImageUrl "$(IMAGE_URL)"
diff --git a/get-new-tool-versions/get-new-tool-versions.ps1 b/get-new-tool-versions/get-new-tool-versions.ps1
index 99a9319..af4b1a8 100644
--- a/get-new-tool-versions/get-new-tool-versions.ps1
+++ b/get-new-tool-versions/get-new-tool-versions.ps1
@@ -72,8 +72,9 @@ $versionsToBuild = Skip-ExistingVersions -VersionsFromManifest $versionsFromMani
 
 if ($versionsToBuild) {
     $availableVersions = $versionsToBuild -join ","
-    Write-Host "The following versions are available to build:`n$availableVersions"
-    Write-Output "##vso[task.setvariable variable=TOOL_VERSIONS;isOutput=true]$availableVersions"
+    $toolVersions = $availableVersions.Replace(",",", ")
+    Write-Host "The following versions are available to build:`n$toolVersions"
+    Write-Output "##vso[task.setvariable variable=TOOL_VERSIONS;isOutput=true]$toolVersions"
 } else {
     Write-Host "There aren't versions to build"
 }