diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b464b7fba..976382915 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu"]
-        jvm: ["8", "11", "17", "21", "22"]
+        jvm: ["8", "11", "17", "21", "23"]
         include:
           - os: windows
             jvm: 21
diff --git a/build.sbt b/build.sbt
index 0a4c75cbb..d3e13f6c7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -186,6 +186,11 @@ lazy val cli = projectMatrix
       jgit,
       commonText
     ),
+    dependencyOverrides ++= {
+      // force usage of the latest scala2 library to get compatibility with latest JDK
+      if (isScala3.value) Seq("org.scala-lang" % "scala-library" % scala213)
+      else Seq()
+    },
     libraryDependencies ++= {
       if (isScala3.value) Seq()
       else
diff --git a/project/ScalafixBuild.scala b/project/ScalafixBuild.scala
index 3f66fc02c..83614cd79 100644
--- a/project/ScalafixBuild.scala
+++ b/project/ScalafixBuild.scala
@@ -48,8 +48,8 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
             previousPatchVersions
               .map { patch => s"$binaryVersion.$patch" }
               .filterNot { v =>
-                System.getProperty("java.version").startsWith("22") &&
-                Seq("2.12.18").contains(v)
+                System.getProperty("java.version").startsWith("23") &&
+                Seq("2.12.18", "2.12.19", "2.13.13", "2.13.14").contains(v)
               }
           }