diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 5263fcd42..a8dbd3fd2 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -135,7 +135,7 @@ jobs:
 
             Invoke-WebRequest `
               -MaximumRetryCount 10 `
-              -Uri "https://azuresdktooling.blob.core.windows.net/dependencies/$setupFile" `
+              -Uri "https://azuresdkartifacts.blob.core.windows.net/tools/doxygen/$setupFile" `
               -OutFile $setupFile `
             | Wait-Process;
 
@@ -163,7 +163,8 @@ jobs:
 
         - pwsh: |
             Write-Host "Using apiview parser version ${{ variables.apiviewParserVersion }}"
-            azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/${{ variables.apiviewParserVersion }}/*" "$(System.DefaultWorkingDirectory)/parser" --recursive
+            azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/${{ variables.apiviewParserVersion }}/RelWithDebInfo/ParseAzureSdkCpp.exe" "$(System.DefaultWorkingDirectory)/parser/ParseAzureSdkCpp.exe"
+            azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/${{ variables.apiviewParserVersion }}/RelWithDebInfo/ParseAzureSdkCpp.pdb" "$(System.DefaultWorkingDirectory)/parser/ParseAzureSdkCpp.pdb"
           displayName: Download ApiView Parser.
 
         - task: Powershell@2
@@ -172,7 +173,7 @@ jobs:
             arguments: >
               -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name)
               -OutPath $(Build.ArtifactStagingDirectory)
-              -ParserPath $(System.DefaultWorkingDirectory)/parser/RelWithDebInfo/ParseAzureSdkCpp.exe
+              -ParserPath $(System.DefaultWorkingDirectory)/parser/ParseAzureSdkCpp.exe
               -ServicePath $(Build.SourcesDirectory)/sdk/${{ parameters.ServiceDirectory }}
             pwsh: true
             workingDirectory: $(Pipeline.Workspace)
diff --git a/sdk/attestation/azure-security-attestation/cgmanifest.json b/sdk/attestation/azure-security-attestation/cgmanifest.json
index 648f67628..8869ed396 100644
--- a/sdk/attestation/azure-security-attestation/cgmanifest.json
+++ b/sdk/attestation/azure-security-attestation/cgmanifest.json
@@ -37,8 +37,8 @@
         "Type": "other",
         "Other": {
           "Name": "doxygen",
-          "Version": "1.8.20",
-          "DownloadUrl": "https://azuresdktooling.blob.core.windows.net/dependencies/doxygen-1.8.18-setup.exe"
+          "Version": "1.9.7",
+          "DownloadUrl": "https://azuresdkartifacts.blob.core.windows.net/tools/doxygen/doxygen-1.9.7-setup.exe"
         }
       },
       "DevelopmentDependency": true