diff --git a/.scalafmt.conf b/.scalafmt.conf
index 7df3749e9..7be4d9865 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "2.6.0"
+version = "2.6.1"
 
 maxColumn = 140
 assumeStandardLibraryStripMargin = true
diff --git a/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/DatastaxHelper.scala b/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/DatastaxHelper.scala
index 613c8dcb5..2c5501e09 100644
--- a/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/DatastaxHelper.scala
+++ b/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/DatastaxHelper.scala
@@ -14,7 +14,7 @@ private[datastax] object DatastaxHelper {
     b.withDuration(opt, java.time.Duration.ofNanos(value.toNanos))
   def stringListProperty(opt: DriverOption)(value: List[String])(b: DriverBuilder): DriverBuilder = b.withStringList(opt, value.asJava)
   def intListProperty(opt: DriverOption)(value: List[Int])(b: DriverBuilder): DriverBuilder =
-    b.withIntList(opt, value.map(i => new Integer(i)).asJava)
+    b.withIntList(opt, value.map(Integer.valueOf).asJava)
   def optional[T](f: T => DriverBuilder => DriverBuilder, value: Option[T])(b: DriverBuilder): DriverBuilder =
     value.map(f(_)(b)).getOrElse(b)
 }
diff --git a/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/advanced.scala b/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/advanced.scala
index 64dd97095..8b60f10f4 100644
--- a/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/advanced.scala
+++ b/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/advanced.scala
@@ -209,7 +209,7 @@ final case class SpeculativeExecutionPolicyConfig(`class`: String, maxExecutions
 
 object SpeculativeExecutionPolicyConfig {
 
-  /**  A policy that schedules a configurable number of speculative executions, separated by a fixed delay. */
+  /** A policy that schedules a configurable number of speculative executions, separated by a fixed delay. */
   val ConstantSpeculative: SpeculativeExecutionPolicyConfig = SpeculativeExecutionPolicyConfig(
     "com.datastax.oss.driver.internal.core.specex.ConstantSpeculativeExecutionPolicy",
     Some(3),
diff --git a/doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariModule.scala b/doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariModule.scala
index 99e556b81..70a5bbde2 100644
--- a/doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariModule.scala
+++ b/doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariModule.scala
@@ -12,7 +12,6 @@ import doobie.enum.TransactionIsolation
 import doobie.hikari.HikariTransactor
 
 import scala.concurrent.ExecutionContext
-import scala.jdk.CollectionConverters._
 
 object DoobieHikariModule {
 
@@ -63,7 +62,7 @@ object DoobieHikariModule {
       c.setIsolateInternalQueries(config.isolateInternalQueries)
       c.setRegisterMbeans(config.registerMBeans)
       val dataSourceProperties = new Properties()
-      dataSourceProperties.putAll(config.dataSourceProperties.asJava)
+      config.dataSourceProperties.foreach { case (k, v) => dataSourceProperties.put(k, v) }
       c.setDataSourceProperties(dataSourceProperties)
 
       config.leakDetectionThreshold.map(_.toMillis).foreach(c.setLeakDetectionThreshold)
diff --git a/http4s-server-micrometer/src/main/scala/com/avast/sst/http4s/server/micrometer/MicrometerHttp4sServerMetricsModule.scala b/http4s-server-micrometer/src/main/scala/com/avast/sst/http4s/server/micrometer/MicrometerHttp4sServerMetricsModule.scala
index 7841511c0..622d288c0 100644
--- a/http4s-server-micrometer/src/main/scala/com/avast/sst/http4s/server/micrometer/MicrometerHttp4sServerMetricsModule.scala
+++ b/http4s-server-micrometer/src/main/scala/com/avast/sst/http4s/server/micrometer/MicrometerHttp4sServerMetricsModule.scala
@@ -12,7 +12,8 @@ class MicrometerHttp4sServerMetricsModule[F[_]: Sync](val serverMetrics: HttpRou
 object MicrometerHttp4sServerMetricsModule {
 
   /** Makes [[com.avast.sst.http4s.server.micrometer.MicrometerHttp4sServerMetricsModule]] that can be used to setup monitoring
-    * of the whole HTTP server and individual routes. */
+    * of the whole HTTP server and individual routes.
+    */
   def make[F[_]: Effect](meterRegistry: MeterRegistry, clock: Clock[F]): F[MicrometerHttp4sServerMetricsModule[F]] = {
     implicit val c: Clock[F] = clock