diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index a0f2eda5f..7c6b522b3 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -70,11 +70,11 @@ jobs:
 
   test-java-macos:
     name: Test (Java) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
-    runs-on: [self-hosted, macos, sequoia, ARM64]
+    runs-on: [self-hosted, macos, tahoe, ARM64]
     strategy:
       fail-fast: true
       matrix:
-        swift_version: ['6.2']
+        swift_version: ['6.2.2']
         os_version: ['macos']
         jdk_vendor: ['corretto']
     env:
@@ -158,11 +158,11 @@ jobs:
 
   test-swift-macos:
     name: Test (Swift) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
-    runs-on: [self-hosted, macos, sequoia, ARM64]
+    runs-on: [self-hosted, macos, tahoe, ARM64]
     strategy:
       fail-fast: false
       matrix:
-        swift_version: ['6.2']
+        swift_version: ['6.2.2']
         os_version: ['macos']
         jdk_vendor: ['corretto']
     env:
@@ -230,11 +230,11 @@ jobs:
 
   verify-samples-macos:
     name: Sample ${{ matrix.sample_app }} (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
-    runs-on: [self-hosted, macos, sequoia, ARM64]
+    runs-on: [self-hosted, macos, tahoe, ARM64]
     strategy:
       fail-fast: false
       matrix:
-        swift_version: ['6.2']  # no nightly testing on macOS
+        swift_version: ['6.2.2']  # no nightly testing on macOS
         os_version: ['macos']
         jdk_vendor: ['corretto']
         sample_app: [  # TODO: use a reusable-workflow to generate those names