diff --git a/build/pipelines/ci.yml b/build/pipelines/ci.yml
index 1c23df92487..e4e53e9b28c 100644
--- a/build/pipelines/ci.yml
+++ b/build/pipelines/ci.yml
@@ -95,3 +95,11 @@ stages:
     jobs:
       - template: ./templates/check-formatting.yml
 
+
+  - stage: CodeIndexer
+    displayName: Github CodeNav Indexer
+    dependsOn: [Build_x64]
+    condition: succeeded()
+    jobs:
+      - template: ./templates/codenav-indexer.yml
+    condition: not(eq(variables['Build.Reason'], 'PullRequest'))
diff --git a/build/pipelines/templates/build-console-ci.yml b/build/pipelines/templates/build-console-ci.yml
index 45d6bd4267e..53e6f7de44b 100644
--- a/build/pipelines/templates/build-console-ci.yml
+++ b/build/pipelines/templates/build-console-ci.yml
@@ -11,6 +11,7 @@ jobs:
     BuildConfiguration: ${{ parameters.configuration }}
     BuildPlatform: ${{ parameters.platform }}
     WindowsTerminalBranding: ${{ parameters.branding }}
+    EnableRichCodeNavigation: true
   pool: 
     ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
       name: WinDevPoolOSS-L
diff --git a/build/pipelines/templates/codenav-indexer.yml b/build/pipelines/templates/codenav-indexer.yml
new file mode 100644
index 00000000000..04e018ed2a0
--- /dev/null
+++ b/build/pipelines/templates/codenav-indexer.yml
@@ -0,0 +1,22 @@
+parameters:
+  artifactName: 'drop'
+
+jobs:
+- job: CodeNavIndexer
+  displayName: Run Github CodeNav Indexer
+  pool: { vmImage: windows-2019 }
+
+  steps:
+  - checkout: self
+    fetchDepth: 1
+    submodules: false
+    clean: true
+
+  - task: DownloadBuildArtifacts@0
+    inputs:
+      artifactName: ${{ parameters.artifactName }}
+
+  - task: RichCodeNavIndexer@0
+    inputs:
+      languages: 'cpp,csharp'
+    continueOnError: true