diff --git a/main/src/main/scala/sbt/internal/Banner.scala b/main/src/main/scala/sbt/internal/Banner.scala
index b43f811ad..0b5a25e71 100644
--- a/main/src/main/scala/sbt/internal/Banner.scala
+++ b/main/src/main/scala/sbt/internal/Banner.scala
@@ -16,7 +16,7 @@ private[sbt] object Banner {
                 |  - Improved JDK 17 support
                 |  - Improved Build Server Protocol (BSP) support
                 |  - Tab completion of global keys
-                |See https://eed3si9n.com/sbt-1.6.0-beta for full release notes.
+                |See https://eed3si9n.com/sbt-1.6.0 for full release notes.
                 |Hide the banner for this release by running `skipBanner`.
                 |""".stripMargin.linesIterator.mkString("\n"))
       case v if v.startsWith("1.4.0") =>
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 23972722c..d2a166720 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -12,10 +12,10 @@ object Dependencies {
     sys.env.get("BUILD_VERSION") orElse sys.props.get("sbt.build.version")
 
   // sbt modules
-  private val ioVersion = nightlyVersion.getOrElse("1.6.0-M2")
+  private val ioVersion = nightlyVersion.getOrElse("1.6.0")
   private val lmVersion =
-    sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.6.0-M2")
-  val zincVersion = nightlyVersion.getOrElse("1.6.0-M2")
+    sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.6.0")
+  val zincVersion = nightlyVersion.getOrElse("1.6.0")
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
 
diff --git a/protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala b/protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala
index 66ac7bdf0..fa7fce354 100644
--- a/protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala
+++ b/protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala
@@ -49,9 +49,11 @@ object BuildServerConnection {
         "-Xmx100m",
         "-classpath",
         classPath,
-        "xsbt.boot.Boot",
-        "-bsp"
-      ) ++ sbtScript.orElse(sbtLaunchJar)
+      ) ++
+        sbtScript ++
+        Vector("xsbt.boot.Boot", "-bsp") ++
+        (if (sbtScript.isEmpty) sbtLaunchJar else None)
+
     val details = BspConnectionDetails(name, sbtVersion, bspVersion, languages, argv)
     val json = Converter.toJson(details).get
     IO.write(bspConnectionFile, CompactPrinter(json), append = false)