diff --git a/azure-pipelines/get-tool-versions.yml b/azure-pipelines/get-tool-versions.yml
index 5475427..d408885 100644
--- a/azure-pipelines/get-tool-versions.yml
+++ b/azure-pipelines/get-tool-versions.yml
@@ -32,7 +32,7 @@ stages:
 
 - stage: Trigger_Builds
   dependsOn: Get_New_Versions
-  condition: and(succeeded(), ne(stageDependencies.Get_New_Versions.Get_Tool_Versions.outputs['Get_versions.TOOL_VERSIONS'], ''))
+  condition: and(succeeded(), ne(stageDependencies.Get_New_Versions.Get_Tool_Versions.outputs['Get_versions.TOOL_VERSIONS'], ''), ne(variables['WORKFLOW_FILE_NAME'], ''))
   jobs:
   - deployment: Run_Builds
     pool:
diff --git a/azure-pipelines/templates/get-tool-versions-steps.yml b/azure-pipelines/templates/get-tool-versions-steps.yml
index b783b34..7423477 100644
--- a/azure-pipelines/templates/get-tool-versions-steps.yml
+++ b/azure-pipelines/templates/get-tool-versions-steps.yml
@@ -8,37 +8,33 @@ steps:
     arguments: |
         -ToolName "$(TOOL_NAME)"
 
-# - task: PowerShell@2
-#   displayName: 'Cancel build'
-#   condition: and(succeeded(), eq(variables['Get_versions.TOOL_VERSIONS'], ''))
-#   inputs:
-#     TargetType: inline
-#     script: |
-#       Import-Module "./azure-devops/azure-devops-api.ps1"
-#       $azureDevOpsApi = Get-AzureDevOpsApi -TeamFoundationCollectionUri $(System.TeamFoundationCollectionUri) `
-#                                            -ProjectName $(System.TeamProject) `
-#                                            -AccessToken $(System.AccessToken)
-
-#       $AzureDevOpsApi.UpdateBuildStatus($(Build.BuildId), 'Cancelling') | Out-Null
-
 - task: PowerShell@2
   displayName: 'Set env variable'
-  condition: and(succeeded(), ne(variables['Get_versions.TOOL_VERSIONS'], ''))
+  condition: and(succeeded(), ne(variables['TOOL_NAME'], "Python"))
   inputs:
     TargetType: inline
     script: |
       $PipelineUrl = "$(System.TeamFoundationCollectionUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId)"
-      Write-Output "##vso[task.setvariable variable=PIPELINE_URL]$PipelineUrl"
+      Write-Host "##vso[task.setvariable variable=PIPELINE_URL]$PipelineUrl"
+
+- task: PowerShell@2
+  displayName: 'Change build name'
+  condition: and(succeeded(), ne(variables['Get_versions.TOOL_VERSIONS'], ''))
+  inputs:
+    TargetType: inline
+    script: |
+      $newBuildName = "[FOUND] $(Build.BuildNumber)"
+      Write-Host "##vso[build.updatebuildnumber]$newBuildName"
 
-# - task: PowerShell@2
-#   displayName: 'Send Slack notification'
-#   condition: and(succeeded(), ne(variables['Get_versions.TOOL_VERSIONS'], ''))
-#   inputs:
-#     targetType: filePath
-#     filePath: './get-new-tool-versions/send-slack-notification.ps1'
-#     arguments: |
-#       -Url "$(SLACK_CHANNEL_URL)" `
-#       -ToolName "$(TOOL_NAME)" `
-#       -ToolVersion "$(Get_versions.TOOL_VERSIONS)" `
-#       -PipelineUrl "$(PIPELINE_URL)" `
-#       -ImageUrl "$(IMAGE_URL)"
+- task: PowerShell@2
+  displayName: 'Send Slack notification'
+  condition: and(succeeded(), ne(variables['Get_versions.TOOL_VERSIONS'], ''))
+  inputs:
+    targetType: filePath
+    filePath: './get-new-tool-versions/send-slack-notification.ps1'
+    arguments: |
+      -Url "$(SLACK_CHANNEL_URL)" `
+      -ToolName "$(TOOL_NAME)" `
+      -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 2e9064d..42f9312 100644
--- a/get-new-tool-versions/get-new-tool-versions.ps1
+++ b/get-new-tool-versions/get-new-tool-versions.ps1
@@ -37,7 +37,7 @@ if ($VersionsToBuild) {
     $availableVersions = $VersionsToBuild -join ","
     $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"
+    Write-Host "##vso[task.setvariable variable=TOOL_VERSIONS;isOutput=true]$toolVersions"
 } else {
     Write-Host "There aren't versions to build"
 }
diff --git a/get-new-tool-versions/send-slack-notification.ps1 b/get-new-tool-versions/send-slack-notification.ps1
index 75441e9..0c6e57e 100644
--- a/get-new-tool-versions/send-slack-notification.ps1
+++ b/get-new-tool-versions/send-slack-notification.ps1
@@ -27,10 +27,7 @@ param(
     [ValidateNotNullOrEmpty()]
     [System.String]$ToolVersion,
 
-    [Parameter(Mandatory)]
-    [ValidateNotNullOrEmpty()]
     [System.String]$PipelineUrl,
-
     [System.String]$ImageUrl = 'https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png'
 )
 
@@ -38,7 +35,10 @@ param(
 Import-Module $PSScriptRoot/helpers.psm1 -DisableNameChecking
 
 # Create JSON body
-$text = "The following versions of '$toolName' are available to upload: $toolVersion\nLink to the pipeline: $pipelineUrl"
+$text = "The following versions of '$toolName' are available to upload: $toolVersion"
+if ($PipelineUrl) {
+    $text += "\nLink to the pipeline: $pipelineUrl"
+}
 $jsonBodyMessage = @"
 {
     "blocks": [