diff --git a/.azure/pipelines/azure-pipelines.yml b/.azure/pipelines/azure-pipelines.yml
index d6db1bd6..69c76940 100644
--- a/.azure/pipelines/azure-pipelines.yml
+++ b/.azure/pipelines/azure-pipelines.yml
@@ -43,85 +43,71 @@ stages:
       inputs:
         targetType: 'inline'
         script: |
-          Function Get-AzureDevopsBuild() {
-              param(
-                  [Parameter(Mandatory = $true)] [string]$baseUri,
-                  [Parameter(Mandatory = $true)] [string]$accessToken,
-                  [Parameter(Mandatory = $true)] [int]$buildId
-              )
-          
-              try {
-                  [Net.ServicePointManager]::SecurityProtocol = "Tls12, Tls13"
-          
-                  $uri = "$($baseUri)/build/builds/$($buildId)?api-version=6.0"
-                  $headers = @{
-                      Authorization = "Bearer $accessToken"
-                  }
-          
-                  return Invoke-RestMethod -Method Get -Uri $uri -Headers $headers -UseBasicParsing        
-              }
-              catch {
-                  Write-Host -ForeGroundColor Red 'Unhandled exception occurred during agent fetch!'
-                  Write-Host -ForegroundColor Red $_.Exception.Message
-                  throw 
-              }
-          }
-          
           Function Get-AzureDevopsAgent() {
               param(
                   [Parameter(Mandatory = $true)] [string]$baseUri,
                   [Parameter(Mandatory = $true)] [string]$accessToken,
-                  [Parameter(Mandatory = $true)] [int]$poolId,
-                  [Parameter(Mandatory = $true)] [int]$agentId
+                  [Parameter(Mandatory = $true)] [int]$agentId,
+                  [Parameter(Mandatory = $true)] [string]$agentName
               )
-          
+
               try {
-          
                   [Net.ServicePointManager]::SecurityProtocol = "Tls12, Tls13"
-          
-                  $uri = "$($baseUri)/distributedtask/pools/$($poolId)/agents/$($agentId)?api-version=6.0&includeCapabilities=true"
+
                   $headers = @{
                       Authorization = "Bearer $accessToken"
                   }
-          
-                  return Invoke-RestMethod -Method Get -Uri $uri -Headers $headers -UseBasicParsing
+
+                  $uri = "$($baseUri)/distributedtask/pools?api-version=6.0"
+                  $responsePools = Invoke-RestMethod -Method Get -Uri $uri -Headers $headers -UseBasicParsing
+
+                  foreach ($pool in $responsePools.Value) {
+
+                      $uri = "$($baseUri)/distributedtask/pools/$($pool.Id)/agents?api-version=6.0&includeCapabilities=true"
+                      $responseAgents = Invoke-RestMethod -Method Get -Uri $uri -Headers $headers -UseBasicParsing
+
+                      $agents = $responseAgents.Value.Where({$_.id -eq $agentId -and $_.name -eq $agentName})
+                      if (!($agents) -or $agents.Count -eq 0) {
+                          continue
+                      }
+
+                      if ($agents.Count -gt 1) {
+                          throw "Multiple agents ($($agents.Count)) found with id: $agentId and name: $agentName"
+                      }
+
+                      return $agents.Item(0)
+                  }
+
+                  return $null
               }
               catch {
+
                   Write-Host -ForeGroundColor Red 'Unhandled exception occurred during agent fetch!'
                   Write-Host -ForegroundColor Red $_.Exception.Message
                   throw 
               }
-          }
-          
+
           Function Output-AgentCapabilities() {
               param(
                   [Parameter(Mandatory = $true)] [PSCustomObject]$capabilities,
                   [Parameter(Mandatory = $true)] [string]$capabilityType
               )
-          
+
               foreach ($capability in $capabilities.PSObject.Properties) {
                   $envName = "AgentCapabilities.$($capabilityType).$($capability.Name)".Replace('_', '.')
-                  $envValue = $($capability.Value)
-                  
-                  [System.Environment]::SetEnvironmentVariable($envName, $envValue)
+                  [System.Environment]::SetEnvironmentVariable($envName, $($capability.Value))
               }
           }
-          
-          [int]$BuildId = $(Build.BuildId)
+
           [int]$AgentId = $(Agent.Id)
-          Write-Host "BuildId = $BuildId; AgentId = $AgentId"
-          
-          $BuildData = Get-AzureDevopsBuild -baseUri "$(System.CollectionUri)$(System.TeamProject)/_apis" -accessToken $(System.AccessToken) -buildId $BuildId
-          Write-Host $BuildData
+          [string]$AgentName = $(Agent.Name)
+          Write-Host "AgentId = $AgentId; AgentName = $AgentName"
 
-          [int]$PoolId = $BuildData.queue.pool.id
-          Write-Host "PoolId = $PoolId"
-
-          $AgentData = Get-AzureDevopsAgent -baseUri "$(System.CollectionUri)_apis" -accessToken $(System.AccessToken) -poolId $PoolId -agentId $AgentId
-          Write-Host $AgentData
-
-          Output-AgentCapabilities -capabilities $AgentData.systemCapabilities -capabilityType 'System'
-          Output-AgentCapabilities -capabilities $AgentData.userCapabilities -capabilityType 'User'
+          $AgentData = Get-AzureDevopsAgent -baseUri "$(System.CollectionUri)_apis" -accessToken $(System.AccessToken) -agentId $AgentId -agentName $AgentName
+          if ($AgentData) {
+              Output-AgentCapabilities -capabilities $AgentData.systemCapabilities -capabilityType 'System'
+              Output-AgentCapabilities -capabilities $AgentData.userCapabilities -capabilityType 'User'
+          }
         pwsh: true
 
     - task: PowerShell@2