diff --git a/api/src/main/scala/com.olegych.scastie.api/ScalaVersions.scala b/api/src/main/scala/com.olegych.scastie.api/ScalaVersions.scala
index 73532e5af..1adcb2fed 100644
--- a/api/src/main/scala/com.olegych.scastie.api/ScalaVersions.scala
+++ b/api/src/main/scala/com.olegych.scastie.api/ScalaVersions.scala
@@ -20,6 +20,7 @@ object ScalaVersions {
           BuildInfo.stableNext,
           BuildInfo.latestLTS,
           BuildInfo.stableLTS,
+          "3.6.1", // TODO: Abandon this hot-fix release when 3.6.2 is available
           // "3.6.0", Bad release
           "3.5.1",
           "3.5.0",
diff --git a/project/SbtShared.scala b/project/SbtShared.scala
index 6c08a6c01..5dfb2e734 100644
--- a/project/SbtShared.scala
+++ b/project/SbtShared.scala
@@ -26,7 +26,7 @@ object SbtShared {
     val stableLTS  = "3.3.4"
     val stableNext = "3.5.2"
     val latestLTS  = "3.3.4"
-    val latestNext = "3.6.1"
+    val latestNext = "3.6.2-RC1"
     val js         = latest213
     val sbt        = latest212
     val jvm        = latest213