diff --git a/eng/pipelines/docindex.yml b/eng/pipelines/docindex.yml
index 21e623ada65c4..580dba0e41dac 100644
--- a/eng/pipelines/docindex.yml
+++ b/eng/pipelines/docindex.yml
@@ -29,6 +29,11 @@ jobs:
             - Name: azure-sdk/$(DocRepoName)
               WorkingDirectory: $(DailyDocRepoLocation)
 
+
+      - template: /eng/pipelines/templates/steps/mvn-linux-repository-settings.yml
+
+      - template: /eng/pipelines/templates/steps/install-rex-validation-tool.yml
+
       - task: Powershell@2
         inputs:
           pwsh: true
@@ -90,10 +95,6 @@ jobs:
         parameters:
           DailyBranchVariableName: DailyDocsBranchName
 
-      - template: /eng/pipelines/templates/steps/mvn-linux-repository-settings.yml
-
-      - template: /eng/pipelines/templates/steps/install-rex-validation-tool.yml
-
       - task: Powershell@2
         inputs:
           pwsh: true
@@ -142,14 +143,18 @@ jobs:
           ScriptDirectory: $(Build.SourcesDirectory)/eng/common/scripts
           PushArgs: -f
 
-      - task: PowerShell@2
+      - task: AzureCLI@2
         displayName: Queue Docs CI build
         inputs:
-          pwsh: true
-          filePath: eng/common/scripts/Queue-Pipeline.ps1
-          arguments: >
-            -Organization "apidrop"
-            -Project "Content%20CI"
-            -DefinitionId 3188
-            -AuthToken "$(azuresdk-apidrop-devops-queue-build-pat)"
-            -BuildParametersJson (@{ params = (Get-Content ./eng/dailydocsconfig.json -Raw) -replace '%%DailyDocsBranchName%%', "$(DailyDocsBranchName)" } | ConvertTo-Json)
+          azureSubscription: msdocs-apidrop-connection
+          scriptType: pscore
+          scriptLocation: inlineScript
+          inlineScript: |
+            $accessToken = az account get-access-token --resource "499b84ac-1321-427f-aa17-267ca6975798" --query "accessToken" --output tsv
+            $buildParamJson = (@{ params = (Get-Content ./eng/dailydocsconfig.json -Raw) -replace '%%DailyDocsBranchName%%', "$(DailyDocsBranchName)" } | ConvertTo-Json)
+            eng/common/scripts/Queue-Pipeline.ps1 `
+              -Organization "apidrop" `
+              -Project "Content%20CI" `
+              -DefinitionId 3188 `
+              -BuildParametersJson $buildParamJson `
+              -BearerToken $accessToken