diff --git a/.github/templates/test-ios.yml b/.github/templates/test-ios.yml
index 4397ce2eed..72ed913539 100644
--- a/.github/templates/test-ios.yml
+++ b/.github/templates/test-ios.yml
@@ -7,7 +7,7 @@ name: test-ios
 _: #@ template.replace(testDefinition())
 jobs:
   test-xamarin:
-    runs-on: macos-latest
+    runs-on: macos-13
     name: Xamarin.iOS
     timeout-minutes: 90
     steps:
diff --git a/.github/templates/test-macos.yml b/.github/templates/test-macos.yml
index 079ec0999a..487a741571 100644
--- a/.github/templates/test-macos.yml
+++ b/.github/templates/test-macos.yml
@@ -7,7 +7,7 @@ name: test-macos
 _: #@ template.replace(testDefinition())
 jobs:
   test-xamarin:
-    runs-on: macos-latest
+    runs-on: macos-13
     name: Xamarin.macOS
     timeout-minutes: 60
     steps:
@@ -17,7 +17,7 @@ jobs:
         run: #@ "Tests/Tests.XamarinMac/bin/" + configuration + "/Tests.XamarinMac.app/Contents/MacOS/Tests.XamarinMac --headless --result=${{ github.workspace }}/TestResults.XamarinMac.xml --labels=All" + baasTestArgs("xamarinmacos")
       - #@ publishTestsResults("TestResults.XamarinMac.xml", "Xamarin.macOS")
   test-maui:
-    runs-on: macos-12
+    runs-on: macos-13
     name: Maui.MacCatalyst
     timeout-minutes: 60
     steps:
diff --git a/.github/templates/test-net-core.yml b/.github/templates/test-net-core.yml
index d516caded5..875583ebc3 100644
--- a/.github/templates/test-net-core.yml
+++ b/.github/templates/test-net-core.yml
@@ -18,7 +18,7 @@ jobs:
           runtime: win-x64
         - runner: ubuntu-latest
           runtime: linux-x64
-        - runner: macos-latest
+        - runner: macos-13
           runtime: osx-x64
         framework: ${{ fromJson(inputs.framework) }}
         include:
diff --git a/.github/templates/test-tvos.yml b/.github/templates/test-tvos.yml
index 6a4aea1502..09af7b2d2e 100644
--- a/.github/templates/test-tvos.yml
+++ b/.github/templates/test-tvos.yml
@@ -7,7 +7,7 @@ name: test-tvos
 _: #@ template.replace(testDefinition())
 jobs:
   test-xamarin:
-    runs-on: macos-latest
+    runs-on: macos-13
     name: Xamarin.tvOS
     timeout-minutes: 45
     steps:
diff --git a/.github/templates/test-weaver.yml b/.github/templates/test-weaver.yml
index 0452dd2ab2..61ea75d7d3 100644
--- a/.github/templates/test-weaver.yml
+++ b/.github/templates/test-weaver.yml
@@ -18,8 +18,8 @@ jobs:
           runtime: win-x64
         - runner: ubuntu-latest
           runtime: linux-x64
-        - runner: macos-latest
-          runtime: osx-x64
+        - runner: macos-14
+          runtime: osx-arm64
     runs-on: ${{ matrix.os.runner }}
     name: Weaver
     timeout-minutes: 30
diff --git a/.github/workflows/test-ios.yml b/.github/workflows/test-ios.yml
index 8d621c221b..ccdc815a50 100755
--- a/.github/workflows/test-ios.yml
+++ b/.github/workflows/test-ios.yml
@@ -13,7 +13,7 @@ env:
   DOTNET_NOLOGO: true
 jobs:
   test-xamarin:
-    runs-on: macos-latest
+    runs-on: macos-13
     name: Xamarin.iOS
     timeout-minutes: 90
     steps:
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index c7d3b955ad..61d2f1b550 100755
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -13,7 +13,7 @@ env:
   DOTNET_NOLOGO: true
 jobs:
   test-xamarin:
-    runs-on: macos-latest
+    runs-on: macos-13
     name: Xamarin.macOS
     timeout-minutes: 60
     steps:
@@ -61,7 +61,7 @@ jobs:
         path-replace-backslashes: true
         fail-on-error: false
   test-maui:
-    runs-on: macos-12
+    runs-on: macos-13
     name: Maui.MacCatalyst
     timeout-minutes: 60
     steps:
diff --git a/.github/workflows/test-net-core.yml b/.github/workflows/test-net-core.yml
index 579ad97150..af8804c199 100755
--- a/.github/workflows/test-net-core.yml
+++ b/.github/workflows/test-net-core.yml
@@ -27,7 +27,7 @@ jobs:
           runtime: win-x64
         - runner: ubuntu-latest
           runtime: linux-x64
-        - runner: macos-latest
+        - runner: macos-13
           runtime: osx-x64
         framework: ${{ fromJson(inputs.framework) }}
         include:
diff --git a/.github/workflows/test-tvos.yml b/.github/workflows/test-tvos.yml
index d7463ab641..46e1534c40 100755
--- a/.github/workflows/test-tvos.yml
+++ b/.github/workflows/test-tvos.yml
@@ -13,7 +13,7 @@ env:
   DOTNET_NOLOGO: true
 jobs:
   test-xamarin:
-    runs-on: macos-latest
+    runs-on: macos-13
     name: Xamarin.tvOS
     timeout-minutes: 45
     steps:
diff --git a/.github/workflows/test-weaver.yml b/.github/workflows/test-weaver.yml
index 73df913678..fc66fc87db 100755
--- a/.github/workflows/test-weaver.yml
+++ b/.github/workflows/test-weaver.yml
@@ -13,8 +13,8 @@ jobs:
           runtime: win-x64
         - runner: ubuntu-latest
           runtime: linux-x64
-        - runner: macos-latest
-          runtime: osx-x64
+        - runner: macos-14
+          runtime: osx-arm64
     runs-on: ${{ matrix.os.runner }}
     name: Weaver
     timeout-minutes: 30