diff --git a/CHANGELOG.md b/CHANGELOG.md
index 371fe6b0f..0211d0517 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,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.
+- Consolidate Windows and macOS 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/stage-release-appcenter.yml b/build/stage-release-appcenter.yml
index b8c4dd457..c0f95ac1f 100644
--- a/build/stage-release-appcenter.yml
+++ b/build/stage-release-appcenter.yml
@@ -61,7 +61,7 @@ jobs:
 
 - deployment: AppCenter_iOS
   pool:
-    name: $(macOSPoolName)
+    vmImage: $(macOSHostedAgentImage)
     demands:
     - fastlane
   variables:
diff --git a/build/stage-release-appstore.yml b/build/stage-release-appstore.yml
index fc9fe5ab2..d6c91a2bd 100644
--- a/build/stage-release-appstore.yml
+++ b/build/stage-release-appstore.yml
@@ -6,9 +6,7 @@ jobs:
 - deployment: AppStore_iOS_${{ parameters.deploymentEnvironment}}
 
   pool:
-    name: $(macOSPoolName)
-    demands:
-      - Xamarin.iOS_Version -equals $(XAMARIN_IOS_VERSION)
+    vmImage: $(macOSHostedAgentImage)
 
   environment: ${{ parameters.deploymentEnvironment }}
 
diff --git a/build/templates/gitversion.yml b/build/templates/gitversion.yml
index c5df69610..e74073f1a 100644
--- a/build/templates/gitversion.yml
+++ b/build/templates/gitversion.yml
@@ -2,7 +2,7 @@ steps:
   - task: gitversion/setup@0
     retryCountOnTaskFailure: 3
     inputs:
-      versionSpec: '5.10.1'
+      versionSpec: '5.12.0'
     displayName: 'Install GitVersion'
 
 #-if false
diff --git a/build/variables.yml b/build/variables.yml
index ac9fb550f..74ca3a742 100644
--- a/build/variables.yml
+++ b/build/variables.yml
@@ -74,10 +74,6 @@ variables:
   # Virtual machine images
   windowsHostedAgentImage: 'windows-2022'
   macOSHostedAgentImage: 'macOS-12'
-  macOSPoolName: 'macOS'
-
-  # Versions to use
-  XAMARIN_IOS_VERSION: 16.1.1
 
   # Name of the folder where the artefacts will be placed. Variable used in build and release phases.
   # We make seperate folders so that releases can each download only the folder they need.