diff --git a/.github/workflows/swift_package_test.yml b/.github/workflows/swift_package_test.yml
index 85b99c11..690f890b 100644
--- a/.github/workflows/swift_package_test.yml
+++ b/.github/workflows/swift_package_test.yml
@@ -22,7 +22,7 @@ on:
       linux_swift_versions:
         type: string
         description: "Include Linux Swift version list (JSON)"
-        default: "[ \"5.9\", \"5.10\", \"6.0\", \"6.1\", \"nightly-main\", \"nightly-6.1\", \"nightly-6.2\"]"
+        default: "[ \"5.9\", \"5.10\", \"6.0\", \"6.1\", \"nightly-main\", \"nightly-6.2\"]"
       linux_exclude_swift_versions:
         type: string
         description: "Exclude Linux Swift version list (JSON)"
@@ -34,7 +34,7 @@ on:
       windows_swift_versions:
         type: string
         description: "Include Windows Swift version list (JSON)"
-        default: "[\"5.9\", \"6.0\", \"6.1\", \"nightly\", \"nightly-6.1\"]"
+        default: "[\"5.9\", \"6.0\", \"6.1\", \"nightly\", \"nightly-6.2\"]"
       windows_exclude_swift_versions:
         type: string
         description: "Exclude Windows Swift version list (JSON)"
@@ -176,9 +176,9 @@ jobs:
         run: ${{ inputs.linux_build_command }} ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }}
 
   windows-build:
-    name: Windows (${{ matrix.swift_version }} - ${{ inputs.enable_windows_docker && contains(matrix.swift_version, 'nightly') && 'windows-2019' || 'windows-2022' }})
+    name: Windows (${{ matrix.swift_version }} - windows-2022)
     if: ${{ inputs.enable_windows_checks }}
-    runs-on: ${{ inputs.enable_windows_docker && contains(matrix.swift_version, 'nightly') && 'windows-2019' || 'windows-2022' }}
+    runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
@@ -204,7 +204,7 @@ jobs:
         if: ${{ inputs.enable_windows_docker }}
         run: |
           if ("${{ matrix.swift_version }}".Contains("nightly")) {
-            $Image = "swiftlang/swift:${{ matrix.swift_version }}-windowsservercore-1809"
+            $Image = "swiftlang/swift:${{ matrix.swift_version }}-windowsservercore-ltsc2022"
           } else {
             $Image = "swift:${{ matrix.swift_version }}-windowsservercore-ltsc2022"
           }