diff --git a/build-tools/automation/azure-pipelines-nightly.yaml b/build-tools/automation/azure-pipelines-nightly.yaml
index 49a37060c02..ba9400f54fb 100644
--- a/build-tools/automation/azure-pipelines-nightly.yaml
+++ b/build-tools/automation/azure-pipelines-nightly.yaml
@@ -294,6 +294,11 @@ stages:
     timeoutInMinutes: 480
     workspace:
       clean: all
+    variables:
+    - name: ApiScanSoftwareName
+      value: VS
+    - name: ApiScanSoftwareVersion
+      value: 17.10
     steps:
     - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
       parameters:
@@ -317,21 +322,21 @@ stages:
         Contents: |
           $(System.DefaultWorkingDirectory)\bin\$(XA.Build.Configuration)\dotnet\packs\Microsoft.Android*\**\?(*.dll|*.exe|*.pdb)
           $(System.DefaultWorkingDirectory)\binutils-pdb\*.pdb
-        TargetFolder: $(Build.StagingDirectory)\apiscan
+        TargetFolder: $(Agent.TempDirectory)\T
         OverWrite: true
         flattenFolders: true
 
-    - pwsh: Get-ChildItem -Path "$(Build.StagingDirectory)\apiscan" -Recurse
+    - pwsh: Get-ChildItem -Path "$(Agent.TempDirectory)\T" -Recurse
       displayName: List Files for APIScan
 
     ### Run latest version of APIScan listed at https://www.1eswiki.com/wiki/APIScan_Build_Task
     - task: APIScan@2
       displayName: Run APIScan
       inputs:
-        softwareFolder: $(Build.StagingDirectory)\apiscan
-        symbolsFolder: 'SRV*http://symweb;$(Build.StagingDirectory)\apiscan'
-        softwareName: $(ApiScanName)
-        softwareVersionNum: $(Build.SourceBranchName)-$(Build.SourceVersion)$(System.JobAttempt)
+        softwareFolder: $(Agent.TempDirectory)\T
+        symbolsFolder: 'SRV*http://symweb;$(Agent.TempDirectory)\T'
+        softwareName: $(ApiScanSoftwareName)
+        softwareVersionNum: $(ApiScanSoftwareVersion)
         isLargeApp: true
         toolVersion: Latest
       env:
diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallGNUBinutils.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallGNUBinutils.cs
index 7f094a4e364..48f3bf38e94 100644
--- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallGNUBinutils.cs
+++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallGNUBinutils.cs
@@ -122,6 +122,11 @@ void CopyTools (string prefix)
 					Utilities.CopyFile (toolSourcePath, toolDestinationPath);
 					Utilities.CopyFile (toolSourcePdbPath, toolDestinationPdbPath);
 				}
+				// Copy PDB files for tools that have been renamed
+				if (isWindows) {
+					Utilities.CopyFile (Path.Combine (sourcePath, "lld.pdb"), Path.Combine (symbolArchiveDir, "lld.pdb"));
+					Utilities.CopyFile (Path.Combine (sourcePath, "llvm-objcopy.pdb"), Path.Combine (symbolArchiveDir, "llvm-objcopy.pdb"));
+				}
 			}
 		}