diff --git a/.circleci/config.yml b/.circleci/config.yml
index 520b63d1..0f90879e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -92,21 +92,21 @@ workflows:
   build:
     jobs:
       - scala_job:
-          name: 2.12.15
+          name: 2.12
           java_version: jdk8
           scala_version: 2.12.15
       - scala_job:
-          name: 2.13.8
+          name: 2.13
           java_version: jdk8
           scala_version: 2.13.8
       - scala_job:
-          name: 3.0.2
+          name: 3.0
           java_version: jdk8
           scala_version: 3.0.2
       - scala_job:
-          name: 3.1.0
+          name: 3.1
           java_version: jdk8
-          scala_version: 3.1.1
+          scala_version: 3.1.2
       - scala_job:
           name: jdk11_2.12
           java_version: jdk11
@@ -122,7 +122,7 @@ workflows:
       - scala_job:
           name: jdk11_3.1
           java_version: jdk11
-          scala_version: 3.1.1
+          scala_version: 3.1.2
       - scala_job:
           name: jdk17_2.12
           java_version: jdk17
@@ -138,7 +138,7 @@ workflows:
       - scala_job:
           name: jdk17_3.1
           java_version: jdk17
-          scala_version: 3.1.1
+          scala_version: 3.1.2
       - scalajs_job:
           name: sjs1.0_2.12
           scala_version: 2.12.15
@@ -150,7 +150,7 @@ workflows:
           scala_version: 3.0.2
       - scalajs_job:
           name: sjs1.0_3.1
-          scala_version: 3.1.1
+          scala_version: 3.1.2
       - scalanative_job:
           name: native0.4_2.12
           scala_version: 2.12.15
@@ -159,4 +159,4 @@ workflows:
           scala_version: 2.13.8
       - scalanative_job:
           name: native0.4_3
-          scala_version: 3.1.1
+          scala_version: 3.1.2
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7ce10f23..b78666a0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         java: [8, 11, 17]
-        scala: [2.12.15, 2.13.8, 3.0.2, 3.1.1]
+        scala: [2.12.15, 2.13.8, 3.0.2, 3.1.2]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
diff --git a/build.sbt b/build.sbt
index 38ff4a4c..2472095b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -35,14 +35,17 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .settings(
     name    := "scala-xml",
     scalaModuleAutomaticModuleName := Some("scala.xml"),
-    crossScalaVersions := Seq("2.13.8", "2.12.15", "3.0.2", "3.1.1"),
+    crossScalaVersions := Seq("2.13.8", "2.12.15", "3.1.2"),
     scalaVersion := "2.12.15",
 
-    // Don't publish for Scala 3.1 or later, only from 3.0
-    publish / skip := (CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((3, x)) if x > 0 => true
-      case _                     => false
-    }),
+    scalaOutputVersion := {
+      CrossVersion.partialVersion(scalaVersion.value) match {
+        case Some((3, _)) => "3.0.2"
+        case _ => scalaVersion.value
+      }
+    },
+
+    publish / skip := false,
 
     scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((3, _)) =>
@@ -139,6 +142,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   )
   .jsEnablePlugins(ScalaJSJUnitPlugin)
   .nativeSettings(
+    // should be removed after 2.2.0 is released
+    versionPolicyIntention := Compatibility.None,
     // Scala Native cannot run forked tests
     Test / fork := false,
     libraryDependencies += "org.scala-native" %%% "junit-runtime" % nativeVersion % Test,
diff --git a/project/build.properties b/project/build.properties
index c8fcab54..1411c215 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.0-M2