diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index db537d951204..f2fa625c7d28 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -936,6 +936,7 @@
 # Add owners for notifications for specific pipelines
 /eng/pipelines/aggregate-reports.yml                          @joshfree @jonathangiles
 /eng/common/pipelines/codeowners-linter.yml                   @alzimmermsft @srnagar @lmolkova
+/eng/pipelines/docindex.yml                                   @danieljurek @hallipr @weshaggard @benbp
 
 # Add Cosmos source owners as the owners of their specialized matrix
 /eng/pipelines/templates/stages/cosmos-emulator-matrix.json   @kirankumarkolli @Azure/azure-cosmos-java-sdk-connectors
diff --git a/eng/pipelines/docindex.yml b/eng/pipelines/docindex.yml
index 68b50e32b3d9..f22b1992c115 100644
--- a/eng/pipelines/docindex.yml
+++ b/eng/pipelines/docindex.yml
@@ -28,8 +28,8 @@ jobs:
   - job: UpdateDocsMsBuildConfig
     pool:
       name: $(LINUXPOOL)
-      image: $(LINUXNEXTVMIMAGE)
-      os: linux
+      demands: $(LinuxImageDemand)
+
     timeoutInMinutes: 180
     variables:
       DocRepoLocation: $(Pipeline.Workspace)/docs
diff --git a/eng/pipelines/templates/variables/image.yml b/eng/pipelines/templates/variables/image.yml
index 8cf5cf213d9f..296bf7655749 100644
--- a/eng/pipelines/templates/variables/image.yml
+++ b/eng/pipelines/templates/variables/image.yml
@@ -16,3 +16,6 @@ variables:
     value: windows-2022
   - name: MACVMIMAGE
     value: macos-latest
+
+  - name: LinuxImageDemand
+    value: ImageOverride -equals $(LINUXVMIMAGE)