diff --git a/.azure-pipelines-canary.yml b/.azure-pipelines-canary.yml
index 9b3369804..fcd8692b5 100644
--- a/.azure-pipelines-canary.yml
+++ b/.azure-pipelines-canary.yml
@@ -2,11 +2,6 @@ trigger: # Start a new run as soon as a "canaries/build/(...)" branch is created
   branches:
     include:
       - canaries/build/*
-
-resources:
-  containers:
-    - container: windows
-      image: nventive/vs_build-tools:17.2.5
       
 variables:
 - template: build/variables.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 787d0c0ac..94f20a318 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ Prefix your items with `(Template)` if the change is about the template and not
 - Enable `TreatWarningsAsErrors` for the Access, Business, and Presentation projects.
 - Update analyzers packages and severity of rules.
 - Fix crash from ARM base mac on net7.0-iOS. Add `ForceSimulatorX64ArchitectureInIDE` property to mobile head.
+- Consolidate build agents to Microsoft-hosted agents.
 
 ## 2.0.X
 - Renamed the classes providing data to use the `Repository` suffix instead of `Endpoint` or `Service`.
diff --git a/build/canary-merge.yml b/build/canary-merge.yml
index ded8964c9..c72b8d04c 100644
--- a/build/canary-merge.yml
+++ b/build/canary-merge.yml
@@ -12,7 +12,7 @@ trigger: # Start a new run as soon as canaries/dev changes.
       - canaries/dev
 
 pool:
-  name: Windows 2022
+  vmImage: $(windowsHostedAgentImage)
 
 variables:
  SolutionFileName: ApplicationTemplate.sln