diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml
index b2ddb9ea61e97a..fcdc0458902986 100644
--- a/.github/workflows/build-git-installers.yml
+++ b/.github/workflows/build-git-installers.yml
@@ -65,7 +65,7 @@ jobs:
             artifact: pkg-x86_64
             toolchain: x86_64
             mingwprefix: mingw64
-            runner: windows-2019
+            runner: windows-2022
           - name: aarch64
             artifact: pkg-aarch64
             toolchain: clang-aarch64
@@ -192,7 +192,7 @@ jobs:
             artifact: pkg-x86_64
             toolchain: x86_64
             mingwprefix: mingw64
-            runner: windows-2019
+            runner: windows-2022
           - name: aarch64
             artifact: pkg-aarch64
             toolchain: clang-aarch64
@@ -381,7 +381,7 @@ jobs:
 
   # Build and sign Mac OSX installers & upload artifacts
   create-macos-artifacts:
-    runs-on: macos-latest-xl-arm64
+    runs-on: macos-latest
     needs: prereqs
     env:
       VERSION: "${{ needs.prereqs.outputs.tag_version }}"
@@ -720,7 +720,7 @@ jobs:
           - os: ubuntu-latest
             artifact: linux-artifacts
             command: git
-          - os: macos-latest-xl-arm64
+          - os: macos-latest
             artifact: macos-artifacts
             command: git
           - os: macos-latest
diff --git a/.github/workflows/scalar-functional-tests.yml b/.github/workflows/scalar-functional-tests.yml
index 2050d8ff7eb6aa..9dd8b241e515c6 100644
--- a/.github/workflows/scalar-functional-tests.yml
+++ b/.github/workflows/scalar-functional-tests.yml
@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         # Order by runtime (in descending order)
-        os: [windows-2019, macos-13, ubuntu-22.04]
+        os: [windows-2022, macos-13, ubuntu-22.04]
         # Scalar.NET used to be tested using `features: [false, experimental]`
         # But currently, Scalar/C ignores `feature.scalar` altogether, so let's
         # save some electrons and run only one of them...