diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7bb8b1783e..b2b287edaa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,7 +75,7 @@ jobs:
       run: |
         fish -c './mill __.compile'
 
-  jvm-bootstrapped-tests:
+  jvm-bootstrapped-tests-default:
     timeout-minutes: 150
     runs-on: ubuntu-24.04
     steps:
@@ -92,15 +92,15 @@ jobs:
           SCALA_CLI_IT_GROUP: 1
       - name: Convert Mill test reports to JUnit XML format
         if: success() || failure()
-        run: .github/scripts/generate-junit-reports.sc jvm-bootstrapped-tests 'Scala CLI JVM Bootstrapped Tests' test-report.xml out/
+        run: .github/scripts/generate-junit-reports.sc jvm-bootstrapped-tests-default 'Scala CLI JVM Bootstrapped Tests' test-report.xml out/
       - name: Upload test report
         uses: actions/upload-artifact@v6
         if: success() || failure()
         with:
-          name: test-results-jvm-bootstrapped-tests
+          name: test-results-jvm-bootstrapped-tests-default
           path: test-report.xml
 
-  jvm-tests-1:
+  jvm-tests-default:
     timeout-minutes: 150
     runs-on: ubuntu-24.04
     steps:
@@ -117,15 +117,15 @@ jobs:
         SCALA_CLI_IT_GROUP: 1
     - name: Convert Mill test reports to JUnit XML format
       if: success() || failure()
-      run: .github/scripts/generate-junit-reports.sc jvm-tests-1 'Scala CLI JVM Tests (1)' test-report.xml out/
+      run: .github/scripts/generate-junit-reports.sc jvm-tests-default 'Scala CLI JVM Tests (default)' test-report.xml out/
     - name: Upload test report
       uses: actions/upload-artifact@v6
       if: success() || failure()
       with:
-        name: test-results-jvm-tests-1
+        name: test-results-jvm-tests-default
         path: test-report.xml
 
-  jvm-tests-2:
+  jvm-tests-scala-2-13:
     timeout-minutes: 150
     runs-on: ubuntu-24.04
     steps:
@@ -142,15 +142,15 @@ jobs:
         SCALA_CLI_IT_GROUP: 2
     - name: Convert Mill test reports to JUnit XML format
       if: success() || failure()
-      run: .github/scripts/generate-junit-reports.sc jvm-tests-2 'Scala CLI JVM Tests (2)' test-report.xml out/
+      run: .github/scripts/generate-junit-reports.sc jvm-tests-scala-2-13 'Scala CLI JVM Tests (Scala 2.13)' test-report.xml out/
     - name: Upload test report
       uses: actions/upload-artifact@v6
       if: success() || failure()
       with:
-        name: test-results-jvm-tests-2
+        name: test-results-jvm-tests-scala-2-13
         path: test-report.xml
 
-  jvm-tests-3:
+  jvm-tests-scala-2-12:
     timeout-minutes: 150
     runs-on: ubuntu-24.04
     steps:
@@ -167,15 +167,15 @@ jobs:
         SCALA_CLI_IT_GROUP: 3
     - name: Convert Mill test reports to JUnit XML format
       if: success() || failure()
-      run: .github/scripts/generate-junit-reports.sc jvm-tests-3 'Scala CLI JVM Tests (3)' test-report.xml out/
+      run: .github/scripts/generate-junit-reports.sc jvm-tests-scala-2-12 'Scala CLI JVM Tests (Scala 2.12)' test-report.xml out/
     - name: Upload test report
       uses: actions/upload-artifact@v6
       if: success() || failure()
       with:
-        name: test-results-jvm-tests-3
+        name: test-results-jvm-tests-scala-2-12
         path: test-report.xml
 
-  jvm-tests-4:
+  jvm-tests-lts:
     timeout-minutes: 150
     runs-on: ubuntu-24.04
     steps:
@@ -192,15 +192,15 @@ jobs:
           SCALA_CLI_IT_GROUP: 4
       - name: Convert Mill test reports to JUnit XML format
         if: success() || failure()
-        run: .github/scripts/generate-junit-reports.sc jvm-tests-4 'Scala CLI JVM Tests (4)' test-report.xml out/
+        run: .github/scripts/generate-junit-reports.sc jvm-tests-lts 'Scala CLI JVM Tests (Scala 3 LTS)' test-report.xml out/
       - name: Upload test report
         uses: actions/upload-artifact@v6
         if: success() || failure()
         with:
-          name: test-results-jvm-tests-4
+          name: test-results-jvm-tests-lts
           path: test-report.xml
 
-  jvm-tests-5:
+  jvm-tests-rc:
     timeout-minutes: 150
     runs-on: ubuntu-24.04
     steps:
@@ -217,12 +217,12 @@ jobs:
           SCALA_CLI_IT_GROUP: 5
       - name: Convert Mill test reports to JUnit XML format
         if: success() || failure()
-        run: .github/scripts/generate-junit-reports.sc jvm-tests-5 'Scala CLI JVM Tests (5)' test-report.xml out/
+        run: .github/scripts/generate-junit-reports.sc jvm-tests-rc 'Scala CLI JVM Tests (5)' test-report.xml out/
       - name: Upload test report
         uses: actions/upload-artifact@v6
         if: success() || failure()
         with:
-          name: test-results-jvm-tests-5
+          name: test-results-jvm-tests-rc
           path: test-report.xml
 
   generate-linux-launcher:
@@ -251,7 +251,7 @@ jobs:
         if-no-files-found: error
         retention-days: 2
 
-  native-linux-tests-1:
+  native-linux-tests-default:
     needs: generate-linux-launcher
     timeout-minutes: 150
     runs-on: ubuntu-24.04
@@ -276,15 +276,15 @@ jobs:
         SCALA_CLI_SODIUM_JNI_ALLOW: false
     - name: Convert Mill test reports to JUnit XML format
       if: success() || failure()
-      run: .github/scripts/generate-junit-reports.sc linux-tests-1 'Scala CLI Linux Tests (1)' test-report.xml out/
+      run: .github/scripts/generate-junit-reports.sc linux-tests-default 'Scala CLI Linux Tests (default)' test-report.xml out/
     - name: Upload test report
       uses: actions/upload-artifact@v6
       if: success() || failure()
       with:
-        name: test-results-linux-tests-1
+        name: test-results-linux-tests-default
         path: test-report.xml
 
-  native-linux-tests-2:
+  native-linux-tests-scala-2-13:
     needs: generate-linux-launcher
     timeout-minutes: 150
     runs-on: ubuntu-24.04
@@ -309,15 +309,15 @@ jobs:
         SCALA_CLI_SODIUM_JNI_ALLOW: false
     - name: Convert Mill test reports to JUnit XML format
       if: success() || failure()
-      run: .github/scripts/generate-junit-reports.sc linux-tests-2 'Scala CLI Linux Tests (2)' test-report.xml out/
+      run: .github/scripts/generate-junit-reports.sc linux-tests-scala-2-13 'Scala CLI Linux Tests (Scala 2.13)' test-report.xml out/
     - name: Upload test report
       uses: actions/upload-artifact@v6
       if: success() || failure()
       with:
-        name: test-results-linux-tests-2
+        name: test-results-linux-tests-scala-2-13
         path: test-report.xml
 
-  native-linux-tests-3:
+  native-linux-tests-scala-2-12:
     needs: generate-linux-launcher
     timeout-minutes: 150
     runs-on: ubuntu-24.04
@@ -342,15 +342,15 @@ jobs:
         SCALA_CLI_SODIUM_JNI_ALLOW: false
     - name: Convert Mill test reports to JUnit XML format
       if: success() || failure()
-      run: .github/scripts/generate-junit-reports.sc linux-tests-3 'Scala CLI Linux Tests (3)' test-report.xml out/
+      run: .github/scripts/generate-junit-reports.sc linux-tests-scala-2-12 'Scala CLI Linux Tests (Scala 2.12)' test-report.xml out/
     - name: Upload test report
       uses: actions/upload-artifact@v6
       if: success() || failure()
       with:
-        name: test-results-linux-tests-3
+        name: test-results-linux-tests-scala-2-12
         path: test-report.xml
 
-  native-linux-tests-4:
+  native-linux-tests-lts:
     needs: generate-linux-launcher
     timeout-minutes: 150
     runs-on: ubuntu-24.04
@@ -375,15 +375,15 @@ jobs:
           SCALA_CLI_SODIUM_JNI_ALLOW: false
       - name: Convert Mill test reports to JUnit XML format
         if: success() || failure()
-        run: .github/scripts/generate-junit-reports.sc linux-tests-4 'Scala CLI Linux Tests (4)' test-report.xml out/
+        run: .github/scripts/generate-junit-reports.sc linux-tests-lts 'Scala CLI Linux Tests (Scala 3 LTS)' test-report.xml out/
       - name: Upload test report
         uses: actions/upload-artifact@v6
         if: success() || failure()
         with:
-          name: test-results-linux-tests-4
+          name: test-results-linux-tests-lts
           path: test-report.xml
 
-  native-linux-tests-5:
+  native-linux-tests-rc:
     needs: generate-linux-launcher
     timeout-minutes: 150
     runs-on: ubuntu-24.04
@@ -408,12 +408,12 @@ jobs:
           SCALA_CLI_SODIUM_JNI_ALLOW: false
       - name: Convert Mill test reports to JUnit XML format
         if: success() || failure()
-        run: .github/scripts/generate-junit-reports.sc linux-tests-5 'Scala CLI Linux Tests (5)' test-report.xml out/
+        run: .github/scripts/generate-junit-reports.sc linux-tests-rc 'Scala CLI Linux Tests (5)' test-report.xml out/
       - name: Upload test report
         uses: actions/upload-artifact@v6
         if: success() || failure()
         with:
-          name: test-results-linux-tests-5
+          name: test-results-linux-tests-rc
           path: test-report.xml
 
   generate-linux-arm64-native-launcher:
@@ -446,7 +446,7 @@ jobs:
           if-no-files-found: error
           retention-days: 2
 
-  native-linux-arm64-tests-1:
+  native-linux-arm64-tests-default:
     needs: generate-linux-arm64-native-launcher
     timeout-minutes: 150
     runs-on: ubuntu-24.04-arm
@@ -471,15 +471,15 @@ jobs:
           SCALA_CLI_SODIUM_JNI_ALLOW: false
       - name: Convert Mill test reports to JUnit XML format
         if: success() || failure()
-        run: .github/scripts/generate-junit-reports.sc linux-tests-1 'Scala CLI Linux ARM 64 Tests (1)' test-report.xml out/
+        run: .github/scripts/generate-junit-reports.sc linux-tests-default 'Scala CLI Linux ARM 64 Tests (default)' test-report.xml out/
       - name: Upload test report
         uses: actions/upload-artifact@v6
         if: success() || failure()
         with:
-          name: test-results-linux-arm64-tests-1
+          name: test-results-linux-arm64-tests-default
           path: test-report.xml
 
-  native-linux-arm64-tests-5:
+  native-linux-arm64-tests-rc:
     needs: generate-linux-arm64-native-launcher
     timeout-minutes: 150
     runs-on: ubuntu-24.04-arm
@@ -504,12 +504,12 @@ jobs:
           SCALA_CLI_SODIUM_JNI_ALLOW: false
       - name: Convert Mill test reports to JUnit XML format
         if: success() || failure()
-        run: .github/scripts/generate-junit-reports.sc linux-tests-5 'Scala CLI Linux ARM64 Tests (5)' test-report.xml out/
+        run: .github/scripts/generate-junit-reports.sc linux-tests-rc 'Scala CLI Linux ARM64 Tests (5)' test-report.xml out/
       - name: Upload test report
         uses: actions/upload-artifact@v6
         if: success() || failure()
         with:
-          name: test-results-linux-arm64-tests-5
+          name: test-results-linux-arm64-tests-rc
           path: test-report.xml
 
   generate-macos-launcher:
@@ -542,7 +542,7 @@ jobs:
         if-no-files-found: error
         retention-days: 2
 
-  native-macos-tests-1:
+  native-macos-tests-default:
     needs: generate-macos-launcher
     timeout-minutes: 150
     runs-on: "macOS-15-intel"
@@ -571,15 +571,15 @@ jobs:
         SCALA_CLI_SODIUM_JNI_ALLOW: false
     - name: Convert Mill test reports to JUnit XML format
       if: success() || failure()
-      run: .github/scripts/generate-junit-reports.sc macos-tests-1 'Scala CLI MacOS Tests (1)' test-report.xml out/
+      run: .github/scripts/generate-junit-reports.sc macos-tests-default 'Scala CLI MacOS Tests (default)' test-report.xml out/
     - name: Upload test report
       uses: actions/upload-artifact@v6
       if: success() || failure()
       with:
-        name: test-results-macos-tests-1
+        name: test-results-macos-tests-default
         path: test-report.xml
 
-  native-macos-tests-5:
+  native-macos-tests-rc:
     needs: generate-macos-launcher
     timeout-minutes: 150
     runs-on: "macOS-15-intel"
@@ -608,15 +608,15 @@ jobs:
           SCALA_CLI_SODIUM_JNI_ALLOW: false
       - name: Convert Mill test reports to JUnit XML format
         if: success() || failure()
-        run: .github/scripts/generate-junit-reports.sc macos-tests-5 'Scala CLI MacOS Tests (5)' test-report.xml out/
+        run: .github/scripts/generate-junit-reports.sc macos-tests-rc 'Scala CLI MacOS Tests (5)' test-report.xml out/
       - name: Upload test report
         uses: actions/upload-artifact@v6
         if: success() || failure()
         with:
-          name: test-results-macos-tests-5
+          name: test-results-macos-tests-rc
           path: test-report.xml
 
-  generate-macos-m1-launcher:
+  generate-macos-arm64-launcher:
     timeout-minutes: 120
     runs-on: "macOS-15"
     steps:
@@ -641,13 +641,13 @@ jobs:
         run: ./mill -i copyDefaultLauncher --directory artifacts/
       - uses: actions/upload-artifact@v6
         with:
-          name: macos-m1-launchers
+          name: macos-arm64-launchers
           path: artifacts/
           if-no-files-found: error
           retention-days: 2
 
-  native-macos-m1-tests-1:
-    needs: generate-macos-m1-launcher
+  native-macos-arm64-tests-default:
+    needs: generate-macos-arm64-launcher
     timeout-minutes: 150
     runs-on: "macOS-15"
     steps:
@@ -664,7 +664,7 @@ jobs:
         run: scala-cli -e 'assert(System.getProperty("os.arch") == "aarch64")'
       - uses: actions/download-artifact@v7
         with:
-          name: macos-m1-launchers
+          name: macos-arm64-launchers
           path: artifacts/
       - name: Native integration tests
         run: ./mill -i nativeIntegrationTests
@@ -675,16 +675,16 @@ jobs:
           SCALA_CLI_SODIUM_JNI_ALLOW: false
       - name: Convert Mill test reports to JUnit XML format
         if: success() || failure()
-        run: .github/scripts/generate-junit-reports.sc macos-m1-tests-1 'Scala CLI MacOS M1 Tests (1)' test-report.xml out/
+        run: .github/scripts/generate-junit-reports.sc macos-arm64-tests-default 'Scala CLI MacOS ARM64 Tests (default)' test-report.xml out/
       - name: Upload test report
         uses: actions/upload-artifact@v6
         if: success() || failure()
         with:
-          name: test-results-macos-m1-tests-1
+          name: test-results-macos-arm64-tests-default
           path: test-report.xml
 
-  native-macos-m1-tests-2:
-    needs: generate-macos-m1-launcher
+  native-macos-arm64-tests-lts:
+    needs: generate-macos-arm64-launcher
     timeout-minutes: 150
     runs-on: "macOS-15"
     steps:
@@ -701,81 +701,7 @@ jobs:
         run: scala-cli -e 'assert(System.getProperty("os.arch") == "aarch64")'
       - uses: actions/download-artifact@v7
         with:
-          name: macos-m1-launchers
-          path: artifacts/
-      - name: Native integration tests
-        run: ./mill -i nativeIntegrationTests
-        env:
-          UPDATE_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SCALA_CLI_IT_FORCED_LAUNCHER_DIRECTORY: artifacts/
-          SCALA_CLI_IT_GROUP: 2
-          SCALA_CLI_SODIUM_JNI_ALLOW: false
-      - name: Convert Mill test reports to JUnit XML format
-        if: success() || failure()
-        run: .github/scripts/generate-junit-reports.sc macos-m1-tests-2 'Scala CLI MacOS M1 Tests (2)' test-report.xml out/
-      - name: Upload test report
-        uses: actions/upload-artifact@v6
-        if: success() || failure()
-        with:
-          name: test-results-macos-m1-tests-2
-          path: test-report.xml
-
-  native-macos-m1-tests-3:
-    needs: generate-macos-m1-launcher
-    timeout-minutes: 150
-    runs-on: "macOS-15"
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          submodules: true
-      - uses: VirtusLab/scala-cli-setup@v1
-        with:
-          jvm: "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz"
-      - name: Install Bloop separately
-        run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17 
-      - name: Ensure it's running on aarch64
-        run: scala-cli -e 'assert(System.getProperty("os.arch") == "aarch64")'
-      - uses: actions/download-artifact@v7
-        with:
-          name: macos-m1-launchers
-          path: artifacts/
-      - name: Native integration tests
-        run: ./mill -i nativeIntegrationTests
-        env:
-          UPDATE_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SCALA_CLI_IT_FORCED_LAUNCHER_DIRECTORY: artifacts/
-          SCALA_CLI_IT_GROUP: 3
-          SCALA_CLI_SODIUM_JNI_ALLOW: false
-      - name: Convert Mill test reports to JUnit XML format
-        if: success() || failure()
-        run: .github/scripts/generate-junit-reports.sc macos-m1-tests-3 'Scala CLI MacOS M1 Tests (3)' test-report.xml out/
-      - name: Upload test report
-        uses: actions/upload-artifact@v6
-        if: success() || failure()
-        with:
-          name: test-results-macos-m1-tests-3
-          path: test-report.xml
-
-  native-macos-m1-tests-4:
-    needs: generate-macos-m1-launcher
-    timeout-minutes: 150
-    runs-on: "macOS-15"
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          submodules: true
-      - uses: VirtusLab/scala-cli-setup@v1
-        with:
-          jvm: "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz"
-      - name: Install Bloop separately
-        run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17 
-      - name: Ensure it's running on aarch64
-        run: scala-cli -e 'assert(System.getProperty("os.arch") == "aarch64")'
-      - uses: actions/download-artifact@v7
-        with:
-          name: macos-m1-launchers
+          name: macos-arm64-launchers
           path: artifacts/
       - name: Native integration tests
         run: ./mill -i nativeIntegrationTests
@@ -786,16 +712,16 @@ jobs:
           SCALA_CLI_SODIUM_JNI_ALLOW: false
       - name: Convert Mill test reports to JUnit XML format
         if: success() || failure()
-        run: .github/scripts/generate-junit-reports.sc macos-m1-tests-4 'Scala CLI MacOS M1 Tests (4)' test-report.xml out/
+        run: .github/scripts/generate-junit-reports.sc macos-arm64-tests-lts 'Scala CLI MacOS ARM64 Tests (Scala 3 LTS)' test-report.xml out/
       - name: Upload test report
         uses: actions/upload-artifact@v6
         if: success() || failure()
         with:
-          name: test-results-macos-m1-tests-4
+          name: test-results-macos-arm64-tests-lts
           path: test-report.xml
 
-  native-macos-m1-tests-5:
-    needs: generate-macos-m1-launcher
+  native-macos-arm64-tests-rc:
+    needs: generate-macos-arm64-launcher
     timeout-minutes: 150
     runs-on: "macOS-15"
     steps:
@@ -812,7 +738,7 @@ jobs:
         run: scala-cli -e 'assert(System.getProperty("os.arch") == "aarch64")'
       - uses: actions/download-artifact@v7
         with:
-          name: macos-m1-launchers
+          name: macos-arm64-launchers
           path: artifacts/
       - name: Native integration tests
         run: ./mill -i nativeIntegrationTests
@@ -823,12 +749,12 @@ jobs:
           SCALA_CLI_SODIUM_JNI_ALLOW: false
       - name: Convert Mill test reports to JUnit XML format
         if: success() || failure()
-        run: .github/scripts/generate-junit-reports.sc macos-m1-tests-5 'Scala CLI MacOS M1 Tests (5)' test-report.xml out/
+        run: .github/scripts/generate-junit-reports.sc macos-arm64-tests-rc 'Scala CLI MacOS ARM64 Tests (5)' test-report.xml out/
       - name: Upload test report
         uses: actions/upload-artifact@v6
         if: success() || failure()
         with:
-          name: test-results-macos-m1-tests-5
+          name: test-results-macos-arm64-tests-rc
           path: test-report.xml
 
   generate-windows-launcher:
@@ -866,7 +792,7 @@ jobs:
         if-no-files-found: error
         retention-days: 2
 
-  native-windows-tests-1:
+  native-windows-tests-default:
     needs: generate-windows-launcher
     timeout-minutes: 150
     runs-on: "windows-2025"
@@ -903,105 +829,15 @@ jobs:
         SCALA_CLI_SODIUM_JNI_ALLOW: false
     - name: Convert Mill test reports to JUnit XML format
       if: success() || failure()
-      run:  scala-cli shebang .github/scripts/generate-junit-reports.sc windows-tests-1 'Scala CLI Windows Tests (1)' test-report.xml out/
-    - name: Upload test report
-      uses: actions/upload-artifact@v6
-      if: success() || failure()
-      with:
-        name: test-results-windows-tests-1
-        path: test-report.xml
-
-  native-windows-tests-2:
-    needs: generate-windows-launcher
-    timeout-minutes: 150
-    runs-on: "windows-2025"
-    steps:
-    - uses: actions/checkout@v6
-      with:
-        fetch-depth: 0
-        submodules: true
-    - name: Import custom registry and verify
-      uses: ./.github/actions/windows-reg-import
-      with:
-        reg-file: .github/ci/windows/custom.reg
-    - name: Set up Python
-      uses: actions/setup-python@v6
-      with:
-        python-version: "3.10"
-    - uses: VirtusLab/scala-cli-setup@v1
-      with:
-        jvm: "temurin:17"
-    - name: Get latest coursier launcher
-      run: .github/scripts/get-latest-cs.sh
-      shell: bash
-    - uses: actions/download-artifact@v7
-      with:
-        name: windows-launchers
-        path: artifacts/
-    - name: Native integration tests
-      run: ./mill -i nativeIntegrationTests
-      env:
-        COURSIER_JNI: force
-        UPDATE_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SCALA_CLI_IT_FORCED_LAUNCHER_DIRECTORY: artifacts/
-        SCALA_CLI_IT_GROUP: 2
-        SCALA_CLI_SODIUM_JNI_ALLOW: false
-    - name: Convert Mill test reports to JUnit XML format
-      if: success() || failure()
-      run:  scala-cli shebang .github/scripts/generate-junit-reports.sc windows-tests-2 'Scala CLI Windows Tests (2)' test-report.xml out/
+      run:  scala-cli shebang .github/scripts/generate-junit-reports.sc windows-tests-default 'Scala CLI Windows Tests (default)' test-report.xml out/
     - name: Upload test report
       uses: actions/upload-artifact@v6
       if: success() || failure()
       with:
-        name: test-results-windows-tests-2
+        name: test-results-windows-tests-default
         path: test-report.xml
 
-  native-windows-tests-3:
-    needs: generate-windows-launcher
-    timeout-minutes: 150
-    runs-on: "windows-2025"
-    steps:
-    - uses: actions/checkout@v6
-      with:
-        fetch-depth: 0
-        submodules: true
-    - name: Import custom registry and verify
-      uses: ./.github/actions/windows-reg-import
-      with:
-        reg-file: .github/ci/windows/custom.reg
-    - name: Set up Python
-      uses: actions/setup-python@v6
-      with:
-        python-version: "3.10"
-    - uses: VirtusLab/scala-cli-setup@v1
-      with:
-        jvm: "temurin:17"
-    - name: Get latest coursier launcher
-      run: .github/scripts/get-latest-cs.sh
-      shell: bash
-    - uses: actions/download-artifact@v7
-      with:
-        name: windows-launchers
-        path: artifacts/
-    - name: Native integration tests
-      run: ./mill -i nativeIntegrationTests
-      env:
-        COURSIER_JNI: force
-        UPDATE_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SCALA_CLI_IT_FORCED_LAUNCHER_DIRECTORY: artifacts/
-        SCALA_CLI_IT_GROUP: 3
-        SCALA_CLI_SODIUM_JNI_ALLOW: false
-    - name: Convert Mill test reports to JUnit XML format
-      if: success() || failure()
-      run:  scala-cli shebang .github/scripts/generate-junit-reports.sc windows-tests-3 'Scala CLI Windows Tests (3)' test-report.xml out/
-    - name: Upload test report
-      uses: actions/upload-artifact@v6
-      if: success() || failure()
-      with:
-        name: test-results-windows-tests-3
-        path: test-report.xml
-
-  native-windows-tests-4:
+  native-windows-tests-lts:
     needs: generate-windows-launcher
     timeout-minutes: 150
     runs-on: "windows-2025"
@@ -1038,15 +874,15 @@ jobs:
           SCALA_CLI_SODIUM_JNI_ALLOW: false
       - name: Convert Mill test reports to JUnit XML format
         if: success() || failure()
-        run:  scala-cli shebang .github/scripts/generate-junit-reports.sc windows-tests-4 'Scala CLI Windows Tests (4)' test-report.xml out/
+        run:  scala-cli shebang .github/scripts/generate-junit-reports.sc windows-tests-lts 'Scala CLI Windows Tests (Scala 3 LTS)' test-report.xml out/
       - name: Upload test report
         uses: actions/upload-artifact@v6
         if: success() || failure()
         with:
-          name: test-results-windows-tests-4
+          name: test-results-windows-tests-lts
           path: test-report.xml
 
-  native-windows-tests-5:
+  native-windows-tests-rc:
     needs: generate-windows-launcher
     timeout-minutes: 150
     runs-on: "windows-2025"
@@ -1083,12 +919,12 @@ jobs:
           SCALA_CLI_SODIUM_JNI_ALLOW: false
       - name: Convert Mill test reports to JUnit XML format
         if: success() || failure()
-        run:  scala-cli shebang .github/scripts/generate-junit-reports.sc windows-tests-5 'Scala CLI Windows Tests (5)' test-report.xml out/
+        run:  scala-cli shebang .github/scripts/generate-junit-reports.sc windows-tests-rc 'Scala CLI Windows Tests (5)' test-report.xml out/
       - name: Upload test report
         uses: actions/upload-artifact@v6
         if: success() || failure()
         with:
-          name: test-results-windows-tests-5
+          name: test-results-windows-tests-rc
           path: test-report.xml
 
   generate-mostly-static-launcher:
@@ -1114,7 +950,7 @@ jobs:
         if-no-files-found: error
         retention-days: 2
 
-  native-mostly-static-tests-1:
+  native-mostly-static-tests-default:
     needs: generate-mostly-static-launcher
     timeout-minutes: 150
     runs-on: ubuntu-24.04
@@ -1144,12 +980,12 @@ jobs:
       run: ./mill integration.docker-slim.test
     - name: Convert Mill test reports to JUnit XML format
       if: success() || failure()
-      run: .github/scripts/generate-junit-reports.sc native-mostly-static-tests-1 'Scala CLI Native Mostly Static Tests (1)' test-report.xml out/
+      run: .github/scripts/generate-junit-reports.sc native-mostly-static-tests-default 'Scala CLI Native Mostly Static Tests (default)' test-report.xml out/
     - name: Upload test report
       uses: actions/upload-artifact@v6
       if: success() || failure()
       with:
-        name: test-results-native-mostly-static-tests-1
+        name: test-results-native-mostly-static-tests-default
         path: test-report.xml
     - name: Login to GitHub Container Registry
       if: startsWith(github.ref, 'refs/tags/v')
@@ -1161,106 +997,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/v')
       run: .github/scripts/publish-slim-docker-images.sh
 
-  native-mostly-static-tests-2:
-    needs: generate-mostly-static-launcher
-    timeout-minutes: 150
-    runs-on: ubuntu-24.04
-    steps:
-    - uses: actions/checkout@v6
-      with:
-        fetch-depth: 0
-        submodules: true
-    - uses: VirtusLab/scala-cli-setup@v1
-      with:
-        jvm: "temurin:17"
-    - uses: actions/download-artifact@v7
-      with:
-        name: mostly-static-launchers
-        path: artifacts/
-    - name: Native integration tests
-      run: ./mill -i integration.test.nativeMostlyStatic
-      env:
-        UPDATE_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SCALA_CLI_IT_FORCED_LAUNCHER_DIRECTORY: artifacts/
-        SCALA_CLI_IT_GROUP: 2
-        SCALA_CLI_SODIUM_JNI_ALLOW: false
-    - name: Convert Mill test reports to JUnit XML format
-      if: success() || failure()
-      run: .github/scripts/generate-junit-reports.sc native-mostly-static-tests-2 'Scala CLI Native Mostly Static Tests (2)' test-report.xml out/
-    - name: Upload test report
-      uses: actions/upload-artifact@v6
-      if: success() || failure()
-      with:
-        name: test-results-native-mostly-static-tests-2
-        path: test-report.xml
-
-  native-mostly-static-tests-3:
-    needs: generate-mostly-static-launcher
-    timeout-minutes: 150
-    runs-on: ubuntu-24.04
-    steps:
-    - uses: actions/checkout@v6
-      with:
-        fetch-depth: 0
-        submodules: true
-    - uses: VirtusLab/scala-cli-setup@v1
-      with:
-        jvm: "temurin:17"
-    - uses: actions/download-artifact@v7
-      with:
-        name: mostly-static-launchers
-        path: artifacts/
-    - name: Native integration tests
-      run: ./mill -i integration.test.nativeMostlyStatic
-      env:
-        UPDATE_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SCALA_CLI_IT_FORCED_LAUNCHER_DIRECTORY: artifacts/
-        SCALA_CLI_IT_GROUP: 3
-        SCALA_CLI_SODIUM_JNI_ALLOW: false
-    - name: Convert Mill test reports to JUnit XML format
-      if: success() || failure()
-      run: .github/scripts/generate-junit-reports.sc native-mostly-static-tests-3 'Scala CLI Native Mostly Static Tests (3)' test-report.xml out/
-    - name: Upload test report
-      uses: actions/upload-artifact@v6
-      if: success() || failure()
-      with:
-        name: test-results-native-mostly-static-tests-3
-        path: test-report.xml
-
-  native-mostly-static-tests-4:
-    needs: generate-mostly-static-launcher
-    timeout-minutes: 150
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          submodules: true
-      - uses: VirtusLab/scala-cli-setup@v1
-        with:
-          jvm: "temurin:17"
-      - uses: actions/download-artifact@v7
-        with:
-          name: mostly-static-launchers
-          path: artifacts/
-      - name: Native integration tests
-        run: ./mill -i integration.test.nativeMostlyStatic
-        env:
-          UPDATE_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SCALA_CLI_IT_FORCED_LAUNCHER_DIRECTORY: artifacts/
-          SCALA_CLI_IT_GROUP: 4
-          SCALA_CLI_SODIUM_JNI_ALLOW: false
-      - name: Convert Mill test reports to JUnit XML format
-        if: success() || failure()
-        run: .github/scripts/generate-junit-reports.sc native-mostly-static-tests-4 'Scala CLI Native Mostly Static Tests (4)' test-report.xml out/
-      - name: Upload test report
-        uses: actions/upload-artifact@v6
-        if: success() || failure()
-        with:
-          name: test-results-native-mostly-static-tests-4
-          path: test-report.xml
-
-  native-mostly-static-tests-5:
+  native-mostly-static-tests-rc:
     needs: generate-mostly-static-launcher
     timeout-minutes: 150
     runs-on: ubuntu-24.04
@@ -1285,12 +1022,12 @@ jobs:
           SCALA_CLI_SODIUM_JNI_ALLOW: false
       - name: Convert Mill test reports to JUnit XML format
         if: success() || failure()
-        run: .github/scripts/generate-junit-reports.sc native-mostly-static-tests-5 'Scala CLI Native Mostly Static Tests (5)' test-report.xml out/
+        run: .github/scripts/generate-junit-reports.sc native-mostly-static-tests-rc 'Scala CLI Native Mostly Static Tests (5)' test-report.xml out/
       - name: Upload test report
         uses: actions/upload-artifact@v6
         if: success() || failure()
         with:
-          name: test-results-native-mostly-static-tests-5
+          name: test-results-native-mostly-static-tests-rc
           path: test-report.xml
 
 
@@ -1317,7 +1054,7 @@ jobs:
         if-no-files-found: error
         retention-days: 2
 
-  native-static-tests-1:
+  native-static-tests-default:
     needs: generate-static-launcher
     timeout-minutes: 150
     runs-on: ubuntu-24.04
@@ -1347,12 +1084,12 @@ jobs:
       run: ./mill integration.docker.test
     - name: Convert Mill test reports to JUnit XML format
       if: success() || failure()
-      run: .github/scripts/generate-junit-reports.sc native-static-tests-1 'Scala CLI Native Static Tests (1)' test-report.xml out/
+      run: .github/scripts/generate-junit-reports.sc native-static-tests-default 'Scala CLI Native Static Tests (default)' test-report.xml out/
     - name: Upload test report
       uses: actions/upload-artifact@v6
       if: success() || failure()
       with:
-        name: test-results-native-static-tests-1
+        name: test-results-native-static-tests-default
         path: test-report.xml
     - name: Login to GitHub Container Registry
       if: startsWith(github.ref, 'refs/tags/v')
@@ -1364,112 +1101,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/v')
       run: .github/scripts/publish-docker-images.sh
 
-  native-static-tests-2:
-    needs: generate-static-launcher
-    timeout-minutes: 150
-    runs-on: ubuntu-24.04
-    steps:
-    - uses: actions/checkout@v6
-      with:
-        fetch-depth: 0
-        submodules: true
-    - uses: VirtusLab/scala-cli-setup@v1
-      with:
-        jvm: "temurin:17"
-    - uses: actions/download-artifact@v7
-      with:
-        name: static-launchers
-        path: artifacts/
-    - name: Build docker image
-      run: .github/scripts/generate-docker-image.sh
-    - name: Native integration tests
-      run: ./mill -i integration.test.nativeStatic
-      env:
-        UPDATE_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SCALA_CLI_IT_FORCED_LAUNCHER_DIRECTORY: artifacts/
-        SCALA_CLI_IT_GROUP: 2
-        SCALA_CLI_SODIUM_JNI_ALLOW: false
-    - name: Convert Mill test reports to JUnit XML format
-      if: success() || failure()
-      run: .github/scripts/generate-junit-reports.sc native-static-tests-2 'Scala CLI Native Static Tests (2)' test-report.xml out/
-    - name: Upload test report
-      uses: actions/upload-artifact@v6
-      if: success() || failure()
-      with:
-        name: test-results-native-static-tests-2
-        path: test-report.xml
-
-  native-static-tests-3:
-    needs: generate-static-launcher
-    timeout-minutes: 150
-    runs-on: ubuntu-24.04
-    steps:
-    - uses: actions/checkout@v6
-      with:
-        fetch-depth: 0
-        submodules: true
-    - uses: VirtusLab/scala-cli-setup@v1
-      with:
-        jvm: "temurin:17"
-    - uses: actions/download-artifact@v7
-      with:
-        name: static-launchers
-        path: artifacts/
-    - name: Build docker image
-      run: .github/scripts/generate-docker-image.sh
-    - name: Native integration tests
-      run: ./mill -i integration.test.nativeStatic
-      env:
-        UPDATE_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SCALA_CLI_IT_FORCED_LAUNCHER_DIRECTORY: artifacts/
-        SCALA_CLI_IT_GROUP: 3
-        SCALA_CLI_SODIUM_JNI_ALLOW: false
-    - name: Convert Mill test reports to JUnit XML format
-      if: success() || failure()
-      run: .github/scripts/generate-junit-reports.sc native-static-tests-3 'Scala CLI Native Static Tests (3)' test-report.xml out/
-    - name: Upload test report
-      uses: actions/upload-artifact@v6
-      if: success() || failure()
-      with:
-        name: test-results-native-static-tests-3
-        path: test-report.xml
-
-  native-static-tests-4:
-    needs: generate-static-launcher
-    timeout-minutes: 150
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          submodules: true
-      - uses: VirtusLab/scala-cli-setup@v1
-        with:
-          jvm: "temurin:17"
-      - uses: actions/download-artifact@v7
-        with:
-          name: static-launchers
-          path: artifacts/
-      - name: Build docker image
-        run: .github/scripts/generate-docker-image.sh
-      - name: Native integration tests
-        run: ./mill -i integration.test.nativeStatic
-        env:
-          UPDATE_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SCALA_CLI_IT_FORCED_LAUNCHER_DIRECTORY: artifacts/
-          SCALA_CLI_IT_GROUP: 4
-          SCALA_CLI_SODIUM_JNI_ALLOW: false
-      - name: Convert Mill test reports to JUnit XML format
-        if: success() || failure()
-        run: .github/scripts/generate-junit-reports.sc native-static-tests-4 'Scala CLI Native Static Tests (4)' test-report.xml out/
-      - name: Upload test report
-        uses: actions/upload-artifact@v6
-        if: success() || failure()
-        with:
-          name: test-results-native-static-tests-4
-          path: test-report.xml
-
-  native-static-tests-5:
+  native-static-tests-rc:
     needs: generate-static-launcher
     timeout-minutes: 150
     runs-on: ubuntu-24.04
@@ -1496,12 +1128,12 @@ jobs:
           SCALA_CLI_SODIUM_JNI_ALLOW: false
       - name: Convert Mill test reports to JUnit XML format
         if: success() || failure()
-        run: .github/scripts/generate-junit-reports.sc native-static-tests-5 'Scala CLI Native Static Tests (5)' test-report.xml out/
+        run: .github/scripts/generate-junit-reports.sc native-static-tests-rc 'Scala CLI Native Static Tests (5)' test-report.xml out/
       - name: Upload test report
         uses: actions/upload-artifact@v6
         if: success() || failure()
         with:
-          name: test-results-native-static-tests-5
+          name: test-results-native-static-tests-rc
           path: test-report.xml
 
   docs-tests:
@@ -1659,41 +1291,31 @@ jobs:
   publish:
     needs:
       - unit-tests
-      - jvm-bootstrapped-tests
-      - jvm-tests-1
-      - jvm-tests-2
-      - jvm-tests-3
-      - jvm-tests-4
-      - jvm-tests-5
-      - native-linux-tests-1
-      - native-linux-tests-2
-      - native-linux-tests-3
-      - native-linux-tests-4
-      - native-linux-tests-5
-      - native-linux-arm64-tests-1
-      - native-linux-arm64-tests-5
-      - native-macos-tests-1
-      - native-macos-tests-5
-      - native-macos-m1-tests-1
-      - native-macos-m1-tests-2
-      - native-macos-m1-tests-3
-      - native-macos-m1-tests-4
-      - native-macos-m1-tests-5
-      - native-windows-tests-1
-      - native-windows-tests-2
-      - native-windows-tests-3
-      - native-windows-tests-4
-      - native-windows-tests-5
-      - native-mostly-static-tests-1
-      - native-mostly-static-tests-2
-      - native-mostly-static-tests-3
-      - native-mostly-static-tests-4
-      - native-mostly-static-tests-5
-      - native-static-tests-1
-      - native-static-tests-2
-      - native-static-tests-3
-      - native-static-tests-4
-      - native-static-tests-5
+      - jvm-bootstrapped-tests-default
+      - jvm-tests-default
+      - jvm-tests-scala-2-13
+      - jvm-tests-scala-2-12
+      - jvm-tests-lts
+      - jvm-tests-rc
+      - native-linux-tests-default
+      - native-linux-tests-scala-2-13
+      - native-linux-tests-scala-2-12
+      - native-linux-tests-lts
+      - native-linux-tests-rc
+      - native-linux-arm64-tests-default
+      - native-linux-arm64-tests-rc
+      - native-macos-tests-default
+      - native-macos-tests-rc
+      - native-macos-arm64-tests-default
+      - native-macos-arm64-tests-lts
+      - native-macos-arm64-tests-rc
+      - native-windows-tests-default
+      - native-windows-tests-lts
+      - native-windows-tests-rc
+      - native-mostly-static-tests-default
+      - native-mostly-static-tests-rc
+      - native-static-tests-default
+      - native-static-tests-rc
       - vc-redist
       - format
       - checks
@@ -1746,41 +1368,31 @@ jobs:
     timeout-minutes: 20
     needs:
       - unit-tests
-      - jvm-bootstrapped-tests
-      - jvm-tests-1
-      - jvm-tests-2
-      - jvm-tests-3
-      - jvm-tests-4
-      - jvm-tests-5
-      - native-linux-tests-1
-      - native-linux-tests-2
-      - native-linux-tests-3
-      - native-linux-tests-4
-      - native-linux-tests-5
-      - native-linux-arm64-tests-1
-      - native-linux-arm64-tests-5
-      - native-macos-tests-1
-      - native-macos-tests-5
-      - native-macos-m1-tests-1
-      - native-macos-m1-tests-2
-      - native-macos-m1-tests-3
-      - native-macos-m1-tests-4
-      - native-macos-m1-tests-5
-      - native-windows-tests-1
-      - native-windows-tests-2
-      - native-windows-tests-3
-      - native-windows-tests-4
-      - native-windows-tests-5
-      - native-mostly-static-tests-1
-      - native-mostly-static-tests-2
-      - native-mostly-static-tests-3
-      - native-mostly-static-tests-4
-      - native-mostly-static-tests-5
-      - native-static-tests-1
-      - native-static-tests-2
-      - native-static-tests-3
-      - native-static-tests-4
-      - native-static-tests-5
+      - jvm-bootstrapped-tests-default
+      - jvm-tests-default
+      - jvm-tests-scala-2-13
+      - jvm-tests-scala-2-12
+      - jvm-tests-lts
+      - jvm-tests-rc
+      - native-linux-tests-default
+      - native-linux-tests-scala-2-13
+      - native-linux-tests-scala-2-12
+      - native-linux-tests-lts
+      - native-linux-tests-rc
+      - native-linux-arm64-tests-default
+      - native-linux-arm64-tests-rc
+      - native-macos-tests-default
+      - native-macos-tests-rc
+      - native-macos-arm64-tests-default
+      - native-macos-arm64-tests-lts
+      - native-macos-arm64-tests-rc
+      - native-windows-tests-default
+      - native-windows-tests-lts
+      - native-windows-tests-rc
+      - native-mostly-static-tests-default
+      - native-mostly-static-tests-rc
+      - native-static-tests-default
+      - native-static-tests-rc
       - vc-redist
       - format
       - checks
@@ -1819,7 +1431,7 @@ jobs:
     - uses: actions/download-artifact@v7
       if: env.SHOULD_PUBLISH == 'true'
       with:
-        name: macos-m1-launchers
+        name: macos-arm64-launchers
         path: artifacts/
     - uses: actions/download-artifact@v7
       if: env.SHOULD_PUBLISH == 'true'
@@ -1880,7 +1492,7 @@ jobs:
           path: artifacts/
       - uses: actions/download-artifact@v7
         with:
-          name: macos-m1-launchers
+          name: macos-arm64-launchers
           path: artifacts/
       - uses: actions/download-artifact@v7
         with:
diff --git a/modules/cli/src/main/scala/scala/cli/commands/shared/SharedJvmOptions.scala b/modules/cli/src/main/scala/scala/cli/commands/shared/SharedJvmOptions.scala
index c971447113..6e4ac6b26c 100644
--- a/modules/cli/src/main/scala/scala/cli/commands/shared/SharedJvmOptions.scala
+++ b/modules/cli/src/main/scala/scala/cli/commands/shared/SharedJvmOptions.scala
@@ -18,7 +18,7 @@ final case class SharedJvmOptions(
     javaHome: Option[String] = None,
 
   @Group(HelpGroup.Java.toString)
-  @HelpMessage("Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. " +
+  @HelpMessage("Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. " +
   "scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.")
   @ValueDescription("jvm-name")
   @Tag(tags.should)
diff --git a/modules/directives/src/main/scala/scala/build/preprocessing/directives/Jvm.scala b/modules/directives/src/main/scala/scala/build/preprocessing/directives/Jvm.scala
index 310a0836d4..d998e95dc0 100644
--- a/modules/directives/src/main/scala/scala/build/preprocessing/directives/Jvm.scala
+++ b/modules/directives/src/main/scala/scala/build/preprocessing/directives/Jvm.scala
@@ -8,14 +8,14 @@ import scala.cli.commands.SpecificationLevel
 
 @DirectiveGroupName("JVM version")
 @DirectiveExamples("//> using jvm 11")
-@DirectiveExamples("//> using jvm adopt:11")
+@DirectiveExamples("//> using jvm temurin:11")
 @DirectiveExamples("//> using jvm graalvm:21")
 @DirectiveUsage(
   "//> using jvm _value_",
   "`//> using jvm` _value_"
 )
 @DirectiveDescription(
-  "Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. " +
+  "Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. " +
     "scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs."
 )
 @DirectiveLevel(SpecificationLevel.SHOULD)
diff --git a/modules/directives/src/main/scala/scala/build/preprocessing/directives/Toolkit.scala b/modules/directives/src/main/scala/scala/build/preprocessing/directives/Toolkit.scala
index 78719b3690..98dfa4653c 100644
--- a/modules/directives/src/main/scala/scala/build/preprocessing/directives/Toolkit.scala
+++ b/modules/directives/src/main/scala/scala/build/preprocessing/directives/Toolkit.scala
@@ -19,7 +19,7 @@ import scala.cli.commands.SpecificationLevel
   "//> using toolkit _version_",
   """`//> using toolkit` _version_
     |
-    |//> using test.toolkit` _version_
+    |`//> using test.toolkit` _version_
     |""".stripMargin
 )
 @DirectiveDescription(
diff --git a/modules/integration/src/test/scala/scala/cli/integration/ExportJsonTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/ExportJsonTestDefinitions.scala
index 97fe28b6f1..3ff2499767 100644
--- a/modules/integration/src/test/scala/scala/cli/integration/ExportJsonTestDefinitions.scala
+++ b/modules/integration/src/test/scala/scala/cli/integration/ExportJsonTestDefinitions.scala
@@ -43,7 +43,7 @@ abstract class ExportJsonTestDefinitions extends ScalaCliSuite with TestScalaVer
 
       val exportJsonProc =
         // Test --power placed after subcommand name
-        os.proc(TestUtil.cli, "export", "--power", "--json", ".", "--jvm", "adopt:11")
+        os.proc(TestUtil.cli, "export", "--power", "--json", ".", "--jvm", "temurin:11")
           .call(cwd = root)
 
       val jsonContents = readJson(exportJsonProc.out.text())
@@ -53,7 +53,7 @@ abstract class ExportJsonTestDefinitions extends ScalaCliSuite with TestScalaVer
            |"projectVersion":"1.1.2",
            |"scalaVersion":"${Constants.scala3Next}",
            |"platform":"JVM",
-           |"jvmVersion":"adopt:11",
+           |"jvmVersion":"temurin:11",
            |"scopes": {
            | "main": {
            |   "sources": ["${withEscapedBackslashes(root / "Main.scala")}"],
diff --git a/website/docs/reference/cli-options.md b/website/docs/reference/cli-options.md
index 74f7b9b9ac..48bd18d004 100644
--- a/website/docs/reference/cli-options.md
+++ b/website/docs/reference/cli-options.md
@@ -673,7 +673,7 @@ Set the Java home directory
 
 Aliases: `-j`
 
-Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
+Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
 
 ### `--jvm-index`
 
diff --git a/website/docs/reference/directives.md b/website/docs/reference/directives.md
index b5969491de..9a9f0456bb 100644
--- a/website/docs/reference/directives.md
+++ b/website/docs/reference/directives.md
@@ -188,14 +188,14 @@ Exclude sources from the project
 
 ### JVM version
 
-Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
+Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
 
 `//> using jvm` _value_
 
 #### Examples
 `//> using jvm 11`
 
-`//> using jvm adopt:11`
+`//> using jvm temurin:11`
 
 `//> using jvm graalvm:21`
 
@@ -685,7 +685,7 @@ Use a toolkit as dependency (not supported in Scala 2.12), 'default' version for
 
 `//> using toolkit` _version_
 
-//> using test.toolkit` _version_
+`//> using test.toolkit` _version_
 
 
 #### Examples
diff --git a/website/docs/reference/scala-command/cli-options.md b/website/docs/reference/scala-command/cli-options.md
index 2abc806548..9e3901d274 100644
--- a/website/docs/reference/scala-command/cli-options.md
+++ b/website/docs/reference/scala-command/cli-options.md
@@ -598,7 +598,7 @@ Aliases: `-j`
 
 `SHOULD have` per Scala Runner specification
 
-Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
+Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
 
 ### `--jvm-index`
 
diff --git a/website/docs/reference/scala-command/directives.md b/website/docs/reference/scala-command/directives.md
index de36a62838..39124a0be2 100644
--- a/website/docs/reference/scala-command/directives.md
+++ b/website/docs/reference/scala-command/directives.md
@@ -217,14 +217,14 @@ Exclude sources from the project
 
 ### JVM version
 
-Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
+Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
 
 `//> using jvm` _value_
 
 #### Examples
 `//> using jvm 11`
 
-`//> using jvm adopt:11`
+`//> using jvm temurin:11`
 
 `//> using jvm graalvm:21`
 
@@ -479,7 +479,7 @@ Use a toolkit as dependency (not supported in Scala 2.12), 'default' version for
 
 `//> using toolkit` _version_
 
-//> using test.toolkit` _version_
+`//> using test.toolkit` _version_
 
 
 #### Examples
diff --git a/website/docs/reference/scala-command/runner-specification.md b/website/docs/reference/scala-command/runner-specification.md
index 1add768417..3c523cd91d 100644
--- a/website/docs/reference/scala-command/runner-specification.md
+++ b/website/docs/reference/scala-command/runner-specification.md
@@ -246,7 +246,7 @@ Set the Java home directory
 
 **--jvm**
 
-Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
+Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
 
 Aliases: `-j`
 
@@ -721,7 +721,7 @@ Set the Java home directory
 
 **--jvm**
 
-Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
+Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
 
 Aliases: `-j`
 
@@ -1048,7 +1048,7 @@ Set the Java home directory
 
 **--jvm**
 
-Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
+Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
 
 Aliases: `-j`
 
@@ -1651,7 +1651,7 @@ Set the Java home directory
 
 **--jvm**
 
-Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
+Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
 
 Aliases: `-j`
 
@@ -2280,7 +2280,7 @@ Set the Java home directory
 
 **--jvm**
 
-Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
+Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
 
 Aliases: `-j`
 
@@ -2928,7 +2928,7 @@ Set the Java home directory
 
 **--jvm**
 
-Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
+Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
 
 Aliases: `-j`
 
@@ -3552,7 +3552,7 @@ Set the Java home directory
 
 **--jvm**
 
-Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
+Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
 
 Aliases: `-j`
 
@@ -4213,7 +4213,7 @@ Set the Java home directory
 
 **--jvm**
 
-Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
+Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
 
 Aliases: `-j`
 
@@ -4934,7 +4934,7 @@ Set the Java home directory
 
 **--jvm**
 
-Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
+Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
 
 Aliases: `-j`
 
@@ -5911,7 +5911,7 @@ Set the Java home directory
 
 **--jvm**
 
-Use a specific JVM, such as `14`, `adopt:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
+Use a specific JVM, such as `14`, `temurin:11`, or `graalvm:21`, or `system`. scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs.
 
 Aliases: `-j`
 
diff --git a/website/docs/release_notes.md b/website/docs/release_notes.md
index aac6acbd42..6e1eeee62b 100644
--- a/website/docs/release_notes.md
+++ b/website/docs/release_notes.md
@@ -4863,7 +4863,7 @@ Added by [@wleczny](https://github.com/wleczny) in [#1505](https://github.com/Vi
 
 The `--jvm` option can now be added via using directives, like
 ```scala
-//> using jvm "adopt:11"
+//> using jvm "temurin:11"
 ```
 
 Added by [@lwronski](https://github.com/lwronski) in [#1539](https://github.com/VirtusLab/scala-cli/pull/1539)