diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
index a5114b2f24..532a03e45b 100644
--- a/.github/workflows/benchmarks.yml
+++ b/.github/workflows/benchmarks.yml
@@ -28,7 +28,11 @@ on:
         default: false
       linux_nightly_6_1_enabled:
         type: boolean
-        description: "Boolean to enable the Linux nightly 6.1 Swift version matrix job. Defaults to true."
+        description: "⚠️  Deprecated, use linux_nightly_next_enabled."
+        default: true
+      linux_nightly_next_enabled:
+        type: boolean
+        description: "Boolean to enable the Linux nightly matrix job for the next Swift version. Defaults to true."
         default: true
       linux_nightly_main_enabled:
         type: boolean
@@ -67,7 +71,7 @@ jobs:
           MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }}
           MATRIX_LINUX_5_10_ENABLED: ${{ inputs.linux_5_10_enabled }}
           MATRIX_LINUX_6_0_ENABLED: ${{ inputs.linux_6_0_enabled }}
-          MATRIX_LINUX_NIGHTLY_6_1_ENABLED: ${{ inputs.linux_nightly_6_1_enabled }}
+          MATRIX_LINUX_NIGHTLY_NEXT_ENABLED: ${{ inputs.linux_nightly_6_1_enabled && inputs.linux_nightly_next_enabled  }}
           MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}
 
   benchmarks:
diff --git a/.github/workflows/cxx_interop.yml b/.github/workflows/cxx_interop.yml
index c36eb3c0d1..4b6caf8a47 100644
--- a/.github/workflows/cxx_interop.yml
+++ b/.github/workflows/cxx_interop.yml
@@ -21,7 +21,11 @@ on:
         default: false
       linux_nightly_6_1_enabled:
         type: boolean
-        description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true."
+        description: "⚠️  Deprecated, use linux_nightly_next_enabled."
+        default: true
+      linux_nightly_next_enabled:
+        type: boolean
+        description: "Boolean to enable the Linux matrix job using the nightly build for the next Swift version. Defaults to true."
         default: true
       linux_nightly_main_enabled:
         type: boolean
@@ -60,7 +64,7 @@ jobs:
           MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }}
           MATRIX_LINUX_5_10_ENABLED: ${{ inputs.linux_5_10_enabled }}
           MATRIX_LINUX_6_0_ENABLED: ${{ inputs.linux_6_0_enabled }}
-          MATRIX_LINUX_NIGHTLY_6_1_ENABLED: ${{ inputs.linux_nightly_6_1_enabled }}
+          MATRIX_LINUX_NIGHTLY_NEXT_ENABLED: ${{ inputs.linux_nightly_6_1_enabled && inputs.linux_nightly_next_enabled }}
           MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}
 
   cxx-interop:
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index d09b45ed91..656859824a 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -37,11 +37,19 @@ on:
         default: ""
       linux_nightly_6_1_enabled:
         type: boolean
-        description: "Boolean to enable the Linux nightly 6.1 Swift version matrix job. Defaults to true."
+        description: "⚠️  Deprecated, use linux_nightly_next_enabled."
         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."
+        description: "⚠️  Deprecated, use linux_nightly_next_arguments_override."
+        default: ""
+      linux_nightly_next_enabled:
+        type: boolean
+        description: "Boolean to enable the Linux matrix job using the nightly build for the next Swift version. Defaults to true."
+        default: true
+      linux_nightly_next_arguments_override:
+        type: string
+        description: "The arguments passed to swift test in the Linux matrix job using the nightly build for the next Swift version."
         default: ""
       linux_nightly_main_enabled:
         type: boolean
@@ -70,11 +78,19 @@ on:
         default: ""
       windows_nightly_6_1_enabled:
         type: boolean
-        description: "Boolean to enable the Windows nightly 6.1 Swift version matrix job. Defaults to false."
+        description: "⚠️  Deprecated, use windows_nightly_next_enabled."
         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."
+        description: "⚠️  Deprecated, use windows_nightly_next_arguments_override."
+        default: ""
+      windows_nightly_next_enabled:
+        type: boolean
+        description: "Boolean to enable the Windows matrix job using the nightly build for the next Swift version. Defaults to true."
+        default: true
+      windows_nightly_next_arguments_override:
+        type: string
+        description: "The arguments passed to swift test in the Windows matrix job using the nightly build for the next Swift version."
         default: ""
       windows_nightly_main_enabled:
         type: boolean
@@ -106,15 +122,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_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_NEXT_ENABLED: ${{ inputs.linux_nightly_6_1_enabled && inputs.linux_nightly_next_enabled }}
+          MATRIX_LINUX_NIGHTLY_NEXT_COMMAND_ARGUMENTS: ${{ inputs.linux_nightly_6_1_arguments_override }} ${{ inputs.linux_nightly_next_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_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_NEXT_ENABLED: ${{ inputs.windows_nightly_6_1_enabled && inputs.windows_nightly_next_enabled }}
+          MATRIX_WINDOWS_NIGHTLY_NEXT_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_6_1_arguments_override }} ${{ inputs.windows_nightly_next_arguments_override }}
           MATRIX_WINDOWS_NIGHTLY_MAIN_ENABLED: ${{ inputs.windows_nightly_main_enabled }}
           MATRIX_WINDOWS_NIGHTLY_MAIN_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_main_arguments_override }}