diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 8d064fec5f..d09b45ed91 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -29,11 +29,19 @@ on:
         default: ""
       linux_nightly_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true."
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."
         default: true
       linux_nightly_6_0_arguments_override:
         type: string
-        description: "The arguments passed to swift test in the Linux nightly 6.0 Swift version matrix job."
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."
+        default: ""
+      linux_nightly_6_1_enabled:
+        type: boolean
+        description: "Boolean to enable the Linux nightly 6.1 Swift version matrix job. Defaults to true."
+        default: true
+      linux_nightly_6_1_arguments_override:
+        type: string
+        description: "The arguments passed to swift test in the Linux nightly 6.1 Swift version matrix job."
         default: ""
       linux_nightly_main_enabled:
         type: boolean
@@ -46,7 +54,7 @@ on:
 
       windows_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the Windows 6.0 Swift version matrix job. Defaults to true."
+        description: "Boolean to enable the Windows 6.0 Swift version matrix job. Defaults to false."
         default: false
       windows_6_0_arguments_override:
         type: string
@@ -54,15 +62,23 @@ on:
         default: ""
       windows_nightly_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the Windows nightly 6.0 Swift version matrix job. Defaults to true."
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."
         default: false
       windows_nightly_6_0_arguments_override:
         type: string
-        description: "The arguments passed to swift test in the Windows nightly 6.0 Swift version matrix job."
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."
+        default: ""
+      windows_nightly_6_1_enabled:
+        type: boolean
+        description: "Boolean to enable the Windows nightly 6.1 Swift version matrix job. Defaults to false."
+        default: false
+      windows_nightly_6_1_arguments_override:
+        type: string
+        description: "The arguments passed to swift test in the Windows nightly 6.1 Swift version matrix job."
         default: ""
       windows_nightly_main_enabled:
         type: boolean
-        description: "Boolean to enable the Windows nightly main Swift version matrix job. Defaults to true."
+        description: "Boolean to enable the Windows nightly main Swift version matrix job. Defaults to false."
         default: false
       windows_nightly_main_arguments_override:
         type: string
@@ -90,15 +106,15 @@ jobs:
           MATRIX_LINUX_5_10_COMMAND_ARGUMENTS: ${{ inputs.linux_5_10_arguments_override }}
           MATRIX_LINUX_6_0_ENABLED: ${{ inputs.linux_6_0_enabled }}
           MATRIX_LINUX_6_0_COMMAND_ARGUMENTS: ${{ inputs.linux_6_0_arguments_override }}
-          MATRIX_LINUX_NIGHTLY_6_0_ENABLED: ${{ inputs.linux_nightly_6_0_enabled }}
-          MATRIX_LINUX_NIGHTLY_6_0_COMMAND_ARGUMENTS: ${{ inputs.linux_nightly_6_0_arguments_override }}
+          MATRIX_LINUX_NIGHTLY_6_1_ENABLED: ${{ inputs.linux_nightly_6_1_enabled }}
+          MATRIX_LINUX_NIGHTLY_6_1_COMMAND_ARGUMENTS: ${{ inputs.linux_nightly_6_1_arguments_override }}
           MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}
           MATRIX_LINUX_NIGHTLY_MAIN_COMMAND_ARGUMENTS: ${{ inputs.linux_nightly_main_arguments_override }}
           MATRIX_WINDOWS_COMMAND: "swift test"
           MATRIX_WINDOWS_6_0_ENABLED: ${{ inputs.windows_6_0_enabled }}
           MATRIX_WINDOWS_6_0_COMMAND_ARGUMENTS: ${{ inputs.windows_6_0_arguments_override }}
-          MATRIX_WINDOWS_NIGHTLY_6_0_ENABLED: ${{ inputs.windows_nightly_6_0_enabled }}
-          MATRIX_WINDOWS_NIGHTLY_6_0_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_6_0_arguments_override }}
+          MATRIX_WINDOWS_NIGHTLY_6_1_ENABLED: ${{ inputs.windows_nightly_6_1_enabled }}
+          MATRIX_WINDOWS_NIGHTLY_6_1_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_6_1_arguments_override }}
           MATRIX_WINDOWS_NIGHTLY_MAIN_ENABLED: ${{ inputs.windows_nightly_main_enabled }}
           MATRIX_WINDOWS_NIGHTLY_MAIN_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_main_arguments_override }}
 
diff --git a/scripts/generate_matrix.sh b/scripts/generate_matrix.sh
index c7915b4783..56a8ca6b98 100755
--- a/scripts/generate_matrix.sh
+++ b/scripts/generate_matrix.sh
@@ -22,8 +22,8 @@ linux_5_10_enabled="${MATRIX_LINUX_5_10_ENABLED:=true}"
 linux_5_10_command_arguments="$MATRIX_LINUX_5_10_COMMAND_ARGUMENTS"
 linux_6_0_enabled="${MATRIX_LINUX_6_0_ENABLED:=true}"
 linux_6_0_command_arguments="$MATRIX_LINUX_6_0_COMMAND_ARGUMENTS"
-linux_nightly_6_0_enabled="${MATRIX_LINUX_NIGHTLY_6_0_ENABLED:=true}"
-linux_nightly_6_0_command_arguments="$MATRIX_LINUX_NIGHTLY_6_0_COMMAND_ARGUMENTS"
+linux_nightly_6_1_enabled="${MATRIX_LINUX_NIGHTLY_6_1_ENABLED:=true}"
+linux_nightly_6_1_command_arguments="$MATRIX_LINUX_NIGHTLY_6_1_COMMAND_ARGUMENTS"
 linux_nightly_main_enabled="${MATRIX_LINUX_NIGHTLY_MAIN_ENABLED:=true}"
 linux_nightly_main_command_arguments="$MATRIX_LINUX_NIGHTLY_MAIN_COMMAND_ARGUMENTS"
 
@@ -31,8 +31,8 @@ windows_command="$MATRIX_WINDOWS_COMMAND"  # required if any Windows pipeline is
 windows_setup_command="$MATRIX_WINDOWS_SETUP_COMMAND"
 windows_6_0_enabled="${MATRIX_WINDOWS_6_0_ENABLED:=false}"
 windows_6_0_command_arguments="$MATRIX_WINDOWS_6_0_COMMAND_ARGUMENTS"
-windows_nightly_6_0_enabled="${MATRIX_WINDOWS_NIGHTLY_6_0_ENABLED:=false}"
-windows_nightly_6_0_command_arguments="$MATRIX_WINDOWS_NIGHTLY_6_0_COMMAND_ARGUMENTS"
+windows_nightly_6_1_enabled="${MATRIX_WINDOWS_NIGHTLY_6_1_ENABLED:=false}"
+windows_nightly_6_1_command_arguments="$MATRIX_WINDOWS_NIGHTLY_6_1_COMMAND_ARGUMENTS"
 windows_nightly_main_enabled="${MATRIX_WINDOWS_NIGHTLY_MAIN_ENABLED:=false}"
 windows_nightly_main_command_arguments="$MATRIX_WINDOWS_NIGHTLY_MAIN_COMMAND_ARGUMENTS"
 
@@ -41,13 +41,13 @@ linux_runner="ubuntu-latest"
 linux_5_9_container_image="swift:5.9-jammy"
 linux_5_10_container_image="swift:5.10-jammy"
 linux_6_0_container_image="swift:6.0-jammy"
-linux_nightly_6_0_container_image="swiftlang/swift:nightly-6.0-jammy"
+linux_nightly_6_1_container_image="swiftlang/swift:nightly-6.1-jammy"
 linux_nightly_main_container_image="swiftlang/swift:nightly-main-jammy"
 
 windows_6_0_runner="windows-2022"
 windows_6_0_container_image="swift:6.0-windowsservercore-ltsc2022"
-windows_nightly_6_0_runner="windows-2019"
-windows_nightly_6_0_container_image="swiftlang/swift:nightly-6.0-windowsservercore-1809"
+windows_nightly_6_1_runner="windows-2019"
+windows_nightly_6_1_container_image="swiftlang/swift:nightly-6.1-windowsservercore-1809"
 windows_nightly_main_runner="windows-2019"
 windows_nightly_main_container_image="swiftlang/swift:nightly-main-windowsservercore-1809"
 
@@ -56,7 +56,7 @@ matrix='{"config": []}'
 
 ## Linux
 if [[ "$linux_5_9_enabled" == "true" || "$linux_5_10_enabled" == "true" || "$linux_6_0_enabled" == "true" || \
-  "$linux_nightly_6_0_enabled" == "true" || "$linux_nightly_main_enabled" == "true" ]]; then
+  "$linux_nightly_6_1_enabled" == "true" || "$linux_nightly_main_enabled" == "true" ]]; then
   if [[ -z "$linux_command" ]]; then
     echo "No linux command defined"; exit 1
   fi
@@ -93,14 +93,14 @@ if [[ "$linux_6_0_enabled" == "true" ]]; then
     '.config[.config| length] |= . + { "name": "6.0", "image": $container_image, "swift_version": "6.0", "platform": "Linux", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner}')
 fi
 
-if [[ "$linux_nightly_6_0_enabled" == "true" ]]; then
+if [[ "$linux_nightly_6_1_enabled" == "true" ]]; then
   matrix=$(echo "$matrix" | jq -c \
     --arg setup_command "$linux_setup_command"  \
     --arg command "$linux_command"  \
-    --arg command_arguments "$linux_nightly_6_0_command_arguments" \
-    --arg container_image "$linux_nightly_6_0_container_image" \
+    --arg command_arguments "$linux_nightly_6_1_command_arguments" \
+    --arg container_image "$linux_nightly_6_1_container_image" \
     --arg runner "$linux_runner" \
-    '.config[.config| length] |= . + { "name": "nightly-6.0", "image": $container_image, "swift_version": "nightly-6.0", "platform": "Linux", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner}')
+    '.config[.config| length] |= . + { "name": "nightly-6.1", "image": $container_image, "swift_version": "nightly-6.1", "platform": "Linux", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner}')
 fi
 
 if [[ "$linux_nightly_main_enabled" == "true" ]]; then
@@ -114,7 +114,7 @@ if [[ "$linux_nightly_main_enabled" == "true" ]]; then
 fi
 
 ## Windows
-if [[ "$windows_6_0_enabled" == "true" || "$windows_nightly_6_0_enabled" == "true" || "$windows_nightly_main_enabled" == "true" ]]; then
+if [[ "$windows_6_0_enabled" == "true" || "$windows_nightly_6_1_enabled" == "true" || "$windows_nightly_main_enabled" == "true" ]]; then
   if [[ -z "$windows_command" ]]; then
     echo "No windows command defined"; exit 1
   fi
@@ -130,14 +130,14 @@ if [[ "$windows_6_0_enabled" == "true" ]]; then
     '.config[.config| length] |= . + { "name": "6.0", "image": $container_image, "swift_version": "6.0", "platform": "Windows", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner }')
 fi
 
-if [[ "$windows_nightly_6_0_enabled" == "true" ]]; then
+if [[ "$windows_nightly_6_1_enabled" == "true" ]]; then
   matrix=$(echo "$matrix" | jq -c \
     --arg setup_command "$windows_setup_command"  \
     --arg command "$windows_command"  \
-    --arg command_arguments "$windows_nightly_6_0_command_arguments" \
-    --arg container_image "$windows_nightly_6_0_container_image" \
-    --arg runner "$windows_nightly_6_0_runner" \
-    '.config[.config| length] |= . + { "name": "nightly-6.0", "image": $container_image, "swift_version": "nightly-6.0", "platform": "Windows", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner }')
+    --arg command_arguments "$windows_nightly_6_1_command_arguments" \
+    --arg container_image "$windows_nightly_6_1_container_image" \
+    --arg runner "$windows_nightly_6_1_runner" \
+    '.config[.config| length] |= . + { "name": "nightly-6.1", "image": $container_image, "swift_version": "nightly-6.1", "platform": "Windows", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner }')
 fi
 
 if [[ "$windows_nightly_main_enabled" == "true" ]]; then