diff --git a/build.sbt b/build.sbt
index f903d8d0c..694472cc8 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,6 +2,8 @@ import BuildHelper._
 
 welcomeMessage
 
+ThisBuild / scalaVersion := Scala213
+
 inThisBuild(
   List(
     organization := "dev.zio",
@@ -439,7 +441,8 @@ lazy val docs = projectMatrix
     ScalaUnidoc / unidoc / unidocProjectFilter :=
       inProjects(
         Seq(zioConfig, zioConfigTypesafe, zioConfigDerivation, zioConfigYaml, zioConfigRefined, zioConfigMagnolia)
-          .flatMap(_.filterProjects(Seq(VirtualAxis.jvm))).map(_.project): _*
+          .flatMap(_.filterProjects(Seq(VirtualAxis.jvm, VirtualAxis.scalaVersionAxis(Scala213, ""))))
+          .map(_.project): _*
       )
   )
   .settings(macroDefinitionSettings)
diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
index 3492ce3d3..23c13ce2d 100644
--- a/project/BuildHelper.scala
+++ b/project/BuildHelper.scala
@@ -143,8 +143,6 @@ object BuildHelper {
     resolvers +=
       "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
     name                                   := s"$prjName",
-    crossScalaVersions                     := Seq(Scala212, Scala213),
-    ThisBuild / scalaVersion               := Scala213,
     scalacOptions ++= stdOptions ++ extraOptions(scalaVersion.value, optimize = !isSnapshot.value),
     libraryDependencies ++= {
       if (scalaVersion.value == Scala3)