diff --git a/.github/workflows/__all-platform-bundle.yml b/.github/workflows/__all-platform-bundle.yml
index a2d8c1abb3..82fe9bce1a 100644
--- a/.github/workflows/__all-platform-bundle.yml
+++ b/.github/workflows/__all-platform-bundle.yml
@@ -56,6 +56,7 @@ jobs:
         include:
           - os: ubuntu-26.04
             version: nightly-latest
+          - os: macos-latest
           - os: macos-26-xlarge
             version: nightly-latest
           - os: windows-2025
diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml
index 41588c9453..e387ccc4c5 100644
--- a/.github/workflows/__multi-language-autodetect.yml
+++ b/.github/workflows/__multi-language-autodetect.yml
@@ -54,24 +54,31 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - os: ubuntu-latest
+            version: stable-v2.19.4
+          - os: macos-15
+            version: stable-v2.19.4
+          - os: ubuntu-latest
           - os: ubuntu-24.04
             version: stable-v2.20.7
-          - os: macos-15-xlarge
+          - os: macos-15
             version: stable-v2.20.7
           - os: ubuntu-26.04
             version: stable-v2.21.4
-          - os: macos-15-xlarge
+          - os: macos-15
             version: stable-v2.21.4
           - os: ubuntu-26.04
             version: stable-v2.22.4
-          - os: macos-15-xlarge
+          - os: macos-15
             version: stable-v2.22.4
           - os: ubuntu-26.04
             version: stable-v2.23.9
+          - os: macos-latest
           - os: macos-26-xlarge
             version: stable-v2.23.9
           - os: ubuntu-26.04
             version: stable-v2.24.3
+          - os: macos-latest
           - os: macos-26-xlarge
             version: stable-v2.24.3
           - os: ubuntu-26.04
@@ -80,14 +87,17 @@ jobs:
             version: stable-v2.25.6
           - os: ubuntu-26.04
             version: default
+          - os: macos-latest
           - os: macos-26-xlarge
             version: default
           - os: ubuntu-26.04
             version: linked
+          - os: macos-latest
           - os: macos-26-xlarge
             version: linked
           - os: ubuntu-26.04
             version: nightly-latest
+          - os: macos-latest
           - os: macos-26-xlarge
             version: nightly-latest
     name: Multi-language repository
@@ -127,7 +137,7 @@ jobs:
 
       - name: Use Xcode 16
         # Only the older CodeQL CLI versions need Xcode 16, and these run on macOS 15.
-        if: matrix.os == 'macos-15-xlarge'
+        if: matrix.os == 'macos-15'
         run: sudo xcode-select -s "/Applications/Xcode_16.app"
 
       - uses: ./../action/init
diff --git a/.github/workflows/__per-language-bundle-validation.yml b/.github/workflows/__per-language-bundle-validation.yml
index 3313ac010a..d141f60f65 100644
--- a/.github/workflows/__per-language-bundle-validation.yml
+++ b/.github/workflows/__per-language-bundle-validation.yml
@@ -68,6 +68,8 @@ jobs:
             os: ubuntu-26.04
             version: linked
           - language: swift
+            os: macos-latest
+            version: nightly-latest
             os: macos-26-xlarge
             version: linked
             build-mode: autobuild
diff --git a/.github/workflows/__swift-autobuild.yml b/.github/workflows/__swift-autobuild.yml
index cc67bfdb63..1abaf20411 100644
--- a/.github/workflows/__swift-autobuild.yml
+++ b/.github/workflows/__swift-autobuild.yml
@@ -34,6 +34,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - os: macos-latest
           - os: macos-26-xlarge
             version: nightly-latest
     name: Swift analysis using autobuild
diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml
index 1d1a8d9f17..2be24251ed 100644
--- a/.github/workflows/__swift-custom-build.yml
+++ b/.github/workflows/__swift-custom-build.yml
@@ -54,6 +54,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - os: macos-latest
+            version: linked
+          - os: macos-latest
+            version: default
+          - os: macos-latest
           - os: macos-26-xlarge
             version: linked
           - os: macos-26-xlarge
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index cc7d3de991..01a66045ee 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -74,6 +74,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        os: [ubuntu-22.04,ubuntu-24.04,windows-2022,windows-2025,macos-14,macos-15]
         os:
           - ubuntu-22.04
           - ubuntu-24.04
@@ -88,6 +89,26 @@ jobs:
       security-events: write
 
     steps:
+    - name: Checkout
+      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+    - name: Initialize CodeQL
+      uses: ./init
+      id: init
+      with:
+        languages: javascript
+        config-file: ./.github/codeql/codeql-config-javascript.yml
+        tools: ${{ matrix.tools }}
+    # confirm steps.init.outputs.codeql-path points to the codeql binary
+    - name: Print CodeQL Version
+      run: >
+        "$CODEQL" version --format=json
+      env:
+        CODEQL: ${{steps.init.outputs.codeql-path}}
+    - name: Perform CodeQL Analysis
+      uses: ./analyze
+      with:
+        category: "/language:javascript"
+        upload: ${{ (github.repository == 'github/codeql-action' && matrix.os == 'ubuntu-24.04' && !matrix.tools && github.event_name != 'merge_group' && 'always' ) || 'never' }}
       - name: Checkout
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Initialize CodeQL
@@ -124,6 +145,24 @@ jobs:
       security-events: write
 
     steps:
+    - name: Checkout
+      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+    - name: Initialize CodeQL
+      uses: ./init
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: none
+        config: >
+          paths-ignore:
+            - lib
+            - tests
+          queries:
+            - uses: security-and-quality
+    - name: Perform CodeQL Analysis
+      uses: ./analyze
+      with:
+        category: "/language:${{ matrix.language }}"
+        upload: ${{ (github.repository == 'github/codeql-action' && github.event_name != 'merge_group' && 'always') || 'never' }}
       - name: Checkout
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Initialize CodeQL
diff --git a/pr-checks/checks/all-platform-bundle.yml b/pr-checks/checks/all-platform-bundle.yml
index 40792c8768..3057fd89c1 100644
--- a/pr-checks/checks/all-platform-bundle.yml
+++ b/pr-checks/checks/all-platform-bundle.yml
@@ -3,6 +3,7 @@ description: "Tests using an all-platform CodeQL Bundle"
 operatingSystems:
   - ubuntu
   - os: macos
+    runner-image: macos-latest
     runner-image: macos-26-xlarge
   - windows
 versions:
diff --git a/pr-checks/checks/multi-language-autodetect.yml b/pr-checks/checks/multi-language-autodetect.yml
index 135fc36727..d953147af9 100644
--- a/pr-checks/checks/multi-language-autodetect.yml
+++ b/pr-checks/checks/multi-language-autodetect.yml
@@ -3,12 +3,13 @@ description: "An end-to-end integration test of a multi-language repository usin
 operatingSystems:
   - ubuntu
   - os: macos
+    runner-image: macos-latest
     runner-image: macos-26-xlarge
   # Older CodeQL CLI versions only support Swift up to 6.1, which requires Xcode 16. That is
   # not available on macOS 26, so run these versions on macOS 15 where we select Xcode 16
   # below. See https://github.com/actions/runner-images/issues/14167.
   - os: macos
-    runner-image: macos-15-xlarge
+    runner-image: macos-15
     codeql-versions:
       - stable-v2.20.7
       - stable-v2.21.4
@@ -29,7 +30,7 @@ steps:
 
   - name: Use Xcode 16
     # Only the older CodeQL CLI versions need Xcode 16, and these run on macOS 15.
-    if: matrix.os == 'macos-15-xlarge'
+    if: matrix.os == 'macos-15'
     run: sudo xcode-select -s "/Applications/Xcode_16.app"
 
   - uses: ./../action/init
diff --git a/pr-checks/checks/per-language-bundle-validation.yml b/pr-checks/checks/per-language-bundle-validation.yml
index b84c15494d..6cb798bf9e 100644
--- a/pr-checks/checks/per-language-bundle-validation.yml
+++ b/pr-checks/checks/per-language-bundle-validation.yml
@@ -37,6 +37,8 @@ matrix:
       os: ubuntu-26.04
       version: linked
     - language: swift
+      os: macos-latest
+      version: nightly-latest
       os: macos-26-xlarge
       version: linked
       build-mode: autobuild
diff --git a/pr-checks/checks/swift-autobuild.yml b/pr-checks/checks/swift-autobuild.yml
index 8087e1aeef..cf6f3cb7d9 100644
--- a/pr-checks/checks/swift-autobuild.yml
+++ b/pr-checks/checks/swift-autobuild.yml
@@ -4,6 +4,7 @@ versions:
   - nightly-latest
 operatingSystems:
   - os: macos
+    runner-image: macos-latest
     runner-image: macos-26-xlarge
 steps:
   - uses: ./../action/init
diff --git a/pr-checks/checks/swift-custom-build.yml b/pr-checks/checks/swift-custom-build.yml
index a10c0a6ed7..1b5e6ad2a1 100644
--- a/pr-checks/checks/swift-custom-build.yml
+++ b/pr-checks/checks/swift-custom-build.yml
@@ -6,6 +6,7 @@ versions:
   - nightly-latest
 operatingSystems:
   - os: macos
+    runner-image: macos-latest
     runner-image: macos-26-xlarge
 installGo: true
 installDotNet: true