diff --git a/eng/common/pipelines/templates/steps/get-pr-owners.yml b/eng/common/pipelines/templates/steps/get-pr-owners.yml
index 545143ce09be..48a8b4815b45 100644
--- a/eng/common/pipelines/templates/steps/get-pr-owners.yml
+++ b/eng/common/pipelines/templates/steps/get-pr-owners.yml
@@ -1,5 +1,7 @@
-parameters: 
+parameters:
   TargetVariable: ''
+  TargetUserVariable: ''
+  TargetTeamVariable: ''
   ServiceDirectory: ''
 
 steps:
@@ -18,7 +20,7 @@ steps:
         --kusto-database-var KUSTO_DB `
         --kusto-table-var KUSTO_TABLE `
         --identity "$(Build.QueuedBy)" `
-        --targetvar "${{ parameters.TargetVariable }}"
+        --targetvar "${{ coalesce(parameters.TargetVariable, parameters.TargetUserVariable) }}"
     displayName: 'Resolving Queuing User'
     continueOnError: true
     workingDirectory: $(Build.SourcesDirectory)/tools_repo/tools/notification-configuration/identity-resolver
@@ -42,4 +44,5 @@ steps:
       arguments: >
         -TargetDirectory "/sdk/${{ parameters.ServiceDirectory }}/"
         -RootDirectory "$(Build.SourcesDirectory)"
-        -VsoVariable "${{ parameters.TargetVariable }}"
\ No newline at end of file
+        -VsoOwningUsers = "${{ coalesce(parameters.TargetVariable, parameters.TargetUserVariable) }}"
+        -VsoOwningTeams = "${{ parameters.TargetTeamVariable }}"
\ No newline at end of file
diff --git a/eng/common/scripts/get-codeowners.ps1 b/eng/common/scripts/get-codeowners.ps1
index f28cb3df7899..327a3b1e205e 100644
--- a/eng/common/scripts/get-codeowners.ps1
+++ b/eng/common/scripts/get-codeowners.ps1
@@ -1,8 +1,14 @@
 param (
   $TargetDirectory, # should be in relative form from root of repo. EG: sdk/servicebus
   $RootDirectory, # ideally $(Build.SourcesDirectory)
-  $VsoVariable = "" # target devops output variable
+  $AuthToken,
+  $VsoOwningUsers = "", # target devops output variable
+  $VsoOwningTeams = "",
+  $VsoOwningLabels = ""
 )
+
+. (Join-Path ${PSScriptRoot} logging.ps1)
+
 $target = $TargetDirectory.ToLower().Trim("/")
 $codeOwnersLocation = Join-Path $RootDirectory -ChildPath ".github/CODEOWNERS"
 $ownedFolders = @{}
@@ -14,30 +20,105 @@ if (!(Test-Path $codeOwnersLocation)) {
 
 $codeOwnersContent = Get-Content $codeOwnersLocation
 
+function VerifyAlias($APIUrl)
+{
+  if ($AuthToken) {
+    $headers = @{
+      Authorization = "bearer $AuthToken"
+    }
+  }
+  try
+  {
+    $response = Invoke-RestMethod -Headers $headers $APIUrl
+  }
+  catch 
+  {
+    Write-Host "Invoke-RestMethod ${APIUrl} failed with exception:`n$_"
+    Write-Host "This might be because a team alias was used for user API request or vice versa."
+    return $false
+  }
+  return $true
+}
+
 foreach ($contentLine in $codeOwnersContent) {
   if (-not $contentLine.StartsWith("#") -and $contentLine){
     $splitLine = $contentLine -split "\s+"
     
     # CODEOWNERS file can also have labels present after the owner aliases
     # gh aliases start with @ in codeowners. don't pass on to API calls
-    $ownedFolders[$splitLine[0].ToLower().Trim("/")] = ($splitLine[1..$($splitLine.Length)] `
-      | ? { $_.StartsWith("@") } `
-      | % { return $_.substring(1) }) -join ","
+
+    $aliases = ($splitLine[1..$($splitLine.Length)] | ? { $_.StartsWith("@") } | % { return $_.substring(1) }) -join ","
+    $labels = @()
+
+    if ($null -ne $previousLine -and $previousLine.Contains("PRLabel:"))
+    {
+      $previousLine = $previousLine.substring($previousLine.IndexOf(':') + 1)
+      $splitPrevLine = $previousLine -split "%" 
+      $labels = ($splitPrevLine[1..$($splitPrevLine.Length)] | % { return $_.Trim() })
+    }
+
+    $ownedFolders[$splitLine[0].ToLower().Trim("/")] = @{ Aliases = $aliases; Labels = $labels }
   }
+  $previousLine = $contentLine
 }
 
 $results = $ownedFolders[$target]
 
 if ($results) {
-  Write-Host "Found a folder $results to match $target"
-  
-  if ($VsoVariable) {
-    $alreadyPresent = [System.Environment]::GetEnvironmentVariable($VsoVariable)
+  Write-Host "Found a folder to match $target"
+  $aliases = $results.Aliases -split ","
+  $users = @()
+  $teams = @()
+
+  foreach ($str in $aliases)
+  {
+    if ($str.IndexOf('/') -ne -1) # Check if it's a team alias e.g. Azure/azure-sdk-eng
+    {
+      $org = $str.substring(0, $str.IndexOf('/'))
+      $team_slug = $str.substring($str.IndexOf('/') + 1)
+      $teamApiUrl =  "https://api.github.com/orgs/$org/teams/$team_slug"
+      if (VerifyAlias -APIUrl $teamApiUrl)
+      {
+        $teams += $team_slug
+        continue
+      }
+    }
+    else
+    {
+      $usersApiUrl = "https://api.github.com/users/$str"
+      if (VerifyAlias -APIUrl $usersApiUrl)
+      {
+        $users += $str
+        continue
+      }
+      LogWarning "Alias ${str} is neither a recognized github user nor a team"
+    }
+  }
+
+  $labels = $results.Labels
+
+  if ($VsoOwningUsers) {
+    $presentOwningUsers = [System.Environment]::GetEnvironmentVariable($VsoOwningUsers)
+    if ($presentOwningUsers) { 
+      $users += $presentOwningUsers
+    }
+    Write-Host "##vso[task.setvariable variable=$VsoOwningUsers;]{0}" -F ($users -join ',')
+  }
+
+  if ($VsoOwningTeams) {
+    $presentOwningTeams = [System.Environment]::GetEnvironmentVariable($VsoOwningTeams)
+    if ($presentOwningTeams) { 
+      $teams += $presentOwningUsers
+    }
+    Write-Host "##vso[task.setvariable variable=$VsoOwningTeams;]{0}" -F ($teams -join ',')
+  }
 
-    if ($alreadyPresent) { 
-      $results += ",$alreadyPresent"
+  if ($VsoOwningLabels) {
+    $presentOwningLabels = [System.Environment]::GetEnvironmentVariable($VsoOwningLabels)
+    if ($presentOwningLabels) {
+      $labels += $presentOwningLabels
     }
-    Write-Host "##vso[task.setvariable variable=$VsoVariable;]$results"
+    Write-Host "##vso[task.setvariable variable=$VsoOwningLabels;]{0}" -F ($labels -join ',')
   }
 
   return $results