diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
index cedee58..065e56f 100644
--- a/.github/workflows/ci-macos.yml
+++ b/.github/workflows/ci-macos.yml
@@ -9,19 +9,22 @@ on:
 
 jobs:
   macos-test-build-release-xcode:
-    runs-on: macOS-latest
+    runs-on: macos-latest
     strategy:
       matrix:
-        xcode: ["13.2.1"]
+        xcode: ["13.4.1", "14.2"]
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@v3.5.2
+
       - name: Select Xcode ${{ matrix.xcode }}
         run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
+
       - name: Test
         run: make test
         env:
           DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
+      
       - name: Upload test artifacts
         if: failure()
         uses: actions/upload-artifact@v2.2.3
@@ -30,10 +33,12 @@ jobs:
           path: |
             .build/**/*.json
             .build/**/*.xctest
+      
       - name: Build Release
         run: make build-release
         env:
           DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
+      
       - name: Upload build artifacts
         if: failure()
         uses: actions/upload-artifact@v2.2.3
diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index 17953ed..73b0e42 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -5,35 +5,21 @@ on:
     branches: [ master ]
   pull_request:
     branches: [ master ]
-  workflow_dispatch:
 
 jobs:
   windows-test-build-release:
     runs-on: windows-latest
-    env:
-        SNAPSHOT: "https://download.swift.org/swift-5.6-release/windows10/swift-5.6-RELEASE/swift-5.6-RELEASE-windows10.exe"
     steps:
-    - uses: actions/checkout@master
-    - uses: seanmiddleditch/gha-setup-vsdevenv@master
-      
-    - name: Install Swift
-      run: |
-          Install-Binary -Url "${env:SNAPSHOT}" -Name "installer.exe" -ArgumentList ("-q")
-    - name: Set Environment Variables
-      run: |
-          echo "SDKROOT=C:\Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          echo "DEVELOPER_DIR=C:\Library\Developer" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-    - name: Adjust Paths
-      run: |
-          echo "C:\Library\Swift-development\bin;C:\Library\icu-67\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-          echo "C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-    - name: Install Supporting Files
-      run: |
-          Copy-Item "$env:SDKROOT\usr\share\ucrt.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\ucrt\module.modulemap"
-          Copy-Item "$env:SDKROOT\usr\share\visualc.modulemap" -destination "$env:VCToolsInstallDir\include\module.modulemap"
-          Copy-Item "$env:SDKROOT\usr\share\visualc.apinotes" -destination "$env:VCToolsInstallDir\include\visualc.apinotes"
-          Copy-Item "$env:SDKROOT\usr\share\winsdk.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\um\module.modulemap"
-    - name: Test
-      run: swift test -v --enable-test-discovery
-    - name: Build Release
-      run: swift build -c release
\ No newline at end of file
+      - uses: compnerd/gha-setup-swift@main
+        with:
+          branch: swift-5.7-release
+          tag: 5.7-RELEASE
+
+      - name: Checkout
+        uses: actions/checkout@v3.5.2
+    
+      - name: Test
+        run: swift test -v --enable-test-discovery
+
+      - name: Build Release
+        run: swift build -c release
\ No newline at end of file