diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
index a5dbb31cb8..8a894c1783 100644
--- a/.azure-pipelines/ci-build.yml
+++ b/.azure-pipelines/ci-build.yml
@@ -3,7 +3,7 @@
 name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
 parameters:
 - name: BuildAgent
-  default: 1es-windows-ps-compute
+  default: 1es-windows-ps-compute-m
   displayName: Build Agent
 - name: Test
   type: boolean
diff --git a/.azure-pipelines/generation-templates/generate-helpdocs-template.yml b/.azure-pipelines/generation-templates/generate-helpdocs-template.yml
index 590f530855..a36d174220 100644
--- a/.azure-pipelines/generation-templates/generate-helpdocs-template.yml
+++ b/.azure-pipelines/generation-templates/generate-helpdocs-template.yml
@@ -9,7 +9,7 @@ parameters:
     type: string
     default: ""
   - name: BUILDAGENT
-    default: 1es-windows-ps-compute
+    default: 1es-windows-ps-compute-m
     displayName: Build Agent
 
 steps:
diff --git a/.azure-pipelines/weekly-generation.yml b/.azure-pipelines/weekly-generation.yml
index 9189680588..0ef0a27a21 100644
--- a/.azure-pipelines/weekly-generation.yml
+++ b/.azure-pipelines/weekly-generation.yml
@@ -10,7 +10,7 @@ name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
 parameters:
 - name: BuildAgent
   displayName: Build Agent
-  default: 1es-windows-ps-compute
+  default: 1es-windows-ps-compute-m
 - name: BaseBranch
   displayName: Base Branch
   default: dev