diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8b0f0d9..a757d18 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -112,14 +112,29 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - image: swiftlang/swift:nightly-6.0-windowsservercore-1809
-    container:
-      image: ${{ matrix.image }}
+          - branch: swift-5.10-release
+            tag: 5.10-RELEASE
+            skip-testing: true
+
+          - branch: swift-6.0-branch
+            tag: 6.0-DEVELOPMENT-SNAPSHOT-2024-09-11-a
+            perform-testing: true
 
     steps:
+      - name: Install Swift
+        uses: compnerd/gha-setup-swift@main
+        with:
+          branch: ${{ matrix.branch}}
+          tag: ${{ matrix.tag }}
+
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Build
+        if: ${{ matrix.skip-testing }}
+        run: |
+          swift build
       - name: Build and test
+        if: ${{ matrix.perform-testing }}
         run: |
           swift build --build-tests
           swift test