diff --git a/build-tools/automation/yaml-templates/setup-jdk-variables.yaml b/build-tools/automation/yaml-templates/setup-jdk-variables.yaml
index 780952babd4..8282fcaf6a9 100644
--- a/build-tools/automation/yaml-templates/setup-jdk-variables.yaml
+++ b/build-tools/automation/yaml-templates/setup-jdk-variables.yaml
@@ -1,11 +1,11 @@
 parameters:
-  jdkMajorVersion: $(DefaultJavaSdkMajorVersion)
-  useAgentJdkPath: true
+  jdkMajorVersion: $(DefaultJavaSdkMajorVersion)   # Generally 11|17|21
+  useAgentJdkPath: true                            # true to use preinstalled agent JDK, false to use 'android-toolchain/jdk-NN'
 
 steps:
 - pwsh: |
     $agentOS="$(Agent.OS)"
-    $agentArch="$(Agent.OSArchitecture)"
+    $agentArch="$(Agent.OSArchitecture)" -eq "ARM64" ? "arm64" : "$(Agent.OSArchitecture)"
     $jdkMajorVersion="${{ parameters.jdkMajorVersion }}"
     $xaPrepareJdkPath="$env:HOME/android-toolchain/jdk-$jdkMajorVersion"
     if ("$agentOS" -eq "Windows_NT") {
diff --git a/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml b/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml
index 43875cc2fca..aa27d4dc9a4 100644
--- a/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml
+++ b/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml
@@ -27,7 +27,7 @@ stages:
     displayName: "macOS > Tests > MSBuild+Emulator"
     pool:
       name: Azure Pipelines
-      vmImage: $(HostedMacImage)
+      vmImage: $(HostedMacImageWithEmulator)
       os: macOS
     timeoutInMinutes: 180
     cancelTimeoutInMinutes: 5
@@ -89,7 +89,7 @@ stages:
       deviceName: wear_square
     pool:
       name: Azure Pipelines
-      vmImage: $(HostedMacImage)
+      vmImage: $(HostedMacImageWithEmulator)
       os: macOS
     workspace:
       clean: all
diff --git a/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml b/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml
index 434de192f42..54fb9005e16 100644
--- a/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml
+++ b/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml
@@ -22,7 +22,7 @@ stages:
       testOS: macOS
       jobName: mac_msbuild_tests
       jobDisplayName: macOS > Tests > MSBuild
-      agentCount: 14
+      agentCount: 10
       xaSourcePath: ${{ parameters.xaSourcePath }}
       repositoryAlias: ${{ parameters.repositoryAlias }}
       commit: ${{ parameters.commit }}
@@ -34,7 +34,7 @@ stages:
       testOS: Windows
       jobName: win_msbuild_tests
       jobDisplayName: Windows > Tests > MSBuild
-      agentCount: 6
+      agentCount: 8
       xaSourcePath: ${{ parameters.xaSourcePath }}
       repositoryAlias: ${{ parameters.repositoryAlias }}
       commit: ${{ parameters.commit }}
diff --git a/build-tools/automation/yaml-templates/stage-package-tests.yaml b/build-tools/automation/yaml-templates/stage-package-tests.yaml
index 60a495df5de..20511486a33 100644
--- a/build-tools/automation/yaml-templates/stage-package-tests.yaml
+++ b/build-tools/automation/yaml-templates/stage-package-tests.yaml
@@ -13,7 +13,7 @@ stages:
     displayName: macOS > Tests > APKs 1
     pool:
       name: Azure Pipelines
-      vmImage: $(HostedMacImage)
+      vmImage: $(HostedMacImageWithEmulator)
       os: macOS
     timeoutInMinutes: 180
     workspace:
@@ -120,7 +120,7 @@ stages:
     displayName: macOS > Tests > APKs 2
     pool:
       name: Azure Pipelines
-      vmImage: $(HostedMacImage)
+      vmImage: $(HostedMacImageWithEmulator)
       os: macOS
     timeoutInMinutes: 180
     workspace:
diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml
index 48b60fe65f3..d1abe276018 100644
--- a/build-tools/automation/yaml-templates/variables.yaml
+++ b/build-tools/automation/yaml-templates/variables.yaml
@@ -14,7 +14,7 @@ variables:
 - name: WindowsToolchainPdbArtifactName
   value: windows-toolchain-pdb
 - name: ApkDiffToolVersion
-  value: 0.0.15
+  value: 0.0.17
 - name: TestSlicerToolVersion
   value: 0.1.0-alpha7
 - name: BootsToolVersion
@@ -30,6 +30,8 @@ variables:
 - name: GitHub.Token
   value: $(github--pat--vs-mobiletools-engineering-service2)
 - name: HostedMacImage
+  value: macOS-14-arm64
+- name: HostedMacImageWithEmulator
   value: macOS-14
 - name: SharedMacPool
   value: VSEng-VSMac-Xamarin-Shared