diff --git a/.scalafmt.conf b/.scalafmt.conf
index b9d8f9f30..a274db157 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "2.6.4"
+version = "2.7.0"
 
 maxColumn = 140
 assumeStandardLibraryStripMargin = true
diff --git a/http4s-client-monix-catnap/src/main/scala/com/avast/sst/http4s/client/monix/catnap/Http4sClientCircuitBreakerModule.scala b/http4s-client-monix-catnap/src/main/scala/com/avast/sst/http4s/client/monix/catnap/Http4sClientCircuitBreakerModule.scala
index 7d500a23a..378ee5f50 100644
--- a/http4s-client-monix-catnap/src/main/scala/com/avast/sst/http4s/client/monix/catnap/Http4sClientCircuitBreakerModule.scala
+++ b/http4s-client-monix-catnap/src/main/scala/com/avast/sst/http4s/client/monix/catnap/Http4sClientCircuitBreakerModule.scala
@@ -28,8 +28,8 @@ object Http4sClientCircuitBreakerModule {
         case tuple @ (response, _) if !httpStatusClassifier.isServerFailure(response.status) => F.pure(tuple)
         case (response, close)                                                               => F.raiseError[(Response[F], F[Unit])](new ServerFailure(response, close))
       }
-      val lifted = circuitBreaker.protect(raisedInternal).recover {
-        case serverFailure: ServerFailure => (serverFailure.response, serverFailure.close)
+      val lifted = circuitBreaker.protect(raisedInternal).recover { case serverFailure: ServerFailure =>
+        (serverFailure.response, serverFailure.close)
       }
       Resource(lifted)
     }
diff --git a/http4s-server-blaze/src/test/scala/com/avast/sst/http4s/server/Http4sBlazeServerModuleTest.scala b/http4s-server-blaze/src/test/scala/com/avast/sst/http4s/server/Http4sBlazeServerModuleTest.scala
index d3790a6a7..bf389e309 100644
--- a/http4s-server-blaze/src/test/scala/com/avast/sst/http4s/server/Http4sBlazeServerModuleTest.scala
+++ b/http4s-server-blaze/src/test/scala/com/avast/sst/http4s/server/Http4sBlazeServerModuleTest.scala
@@ -14,8 +14,8 @@ class Http4sBlazeServerModuleTest extends AsyncFunSuite with Http4sDsl[IO] {
   implicit private val timer: Timer[IO] = IO.timer(ExecutionContext.global)
 
   test("Simple HTTP server") {
-    val routes = Http4sRouting.make(HttpRoutes.of[IO] {
-      case GET -> Root / "test" => Ok("test")
+    val routes = Http4sRouting.make(HttpRoutes.of[IO] { case GET -> Root / "test" =>
+      Ok("test")
     })
     val test = for {
       server <- Http4sBlazeServerModule.make[IO](Http4sBlazeServerConfig("127.0.0.1", 0), routes, ExecutionContext.global)
@@ -23,11 +23,10 @@ class Http4sBlazeServerModuleTest extends AsyncFunSuite with Http4sDsl[IO] {
     } yield (server, client)
 
     test
-      .use {
-        case (server, client) =>
-          client
-            .expect[String](s"http://${server.address.getHostString}:${server.address.getPort}/test")
-            .map(response => assert(response === "test"))
+      .use { case (server, client) =>
+        client
+          .expect[String](s"http://${server.address.getHostString}:${server.address.getPort}/test")
+          .map(response => assert(response === "test"))
       }
       .unsafeToFuture()
   }
diff --git a/http4s-server/src/test/scala/com/avast/sst/http4s/server/middleware/CorrelationIdMiddlewareTest.scala b/http4s-server/src/test/scala/com/avast/sst/http4s/server/middleware/CorrelationIdMiddlewareTest.scala
index 04d2af873..6ba1d786c 100644
--- a/http4s-server/src/test/scala/com/avast/sst/http4s/server/middleware/CorrelationIdMiddlewareTest.scala
+++ b/http4s-server/src/test/scala/com/avast/sst/http4s/server/middleware/CorrelationIdMiddlewareTest.scala
@@ -24,10 +24,9 @@ class CorrelationIdMiddlewareTest extends AsyncFunSuite with Http4sDsl[IO] {
       middleware <- Resource.liftF(CorrelationIdMiddleware.default[IO])
       routes = Http4sRouting.make {
         middleware.wrap {
-          HttpRoutes.of[IO] {
-            case req @ GET -> Root / "test" =>
-              val id = middleware.retrieveCorrelationId(req)
-              Ok("test").map(_.withHeaders(Header("Attribute-Value", id.toString)))
+          HttpRoutes.of[IO] { case req @ GET -> Root / "test" =>
+            val id = middleware.retrieveCorrelationId(req)
+            Ok("test").map(_.withHeaders(Header("Attribute-Value", id.toString)))
           }
         }
       }
@@ -39,19 +38,18 @@ class CorrelationIdMiddlewareTest extends AsyncFunSuite with Http4sDsl[IO] {
     } yield (server, client)
 
     test
-      .use {
-        case (server, client) =>
-          client
-            .run(
-              Request[IO](uri = Uri.unsafeFromString(s"http://${server.address.getHostString}:${server.address.getPort}/test"))
-                .withHeaders(Header("Correlation-Id", "test-value"))
-            )
-            .use { response =>
-              IO.delay {
-                assert(response.headers.get(CaseInsensitiveString("Correlation-Id")).get.value === "test-value")
-                assert(response.headers.get(CaseInsensitiveString("Attribute-Value")).get.value === "Some(CorrelationId(test-value))")
-              }
+      .use { case (server, client) =>
+        client
+          .run(
+            Request[IO](uri = Uri.unsafeFromString(s"http://${server.address.getHostString}:${server.address.getPort}/test"))
+              .withHeaders(Header("Correlation-Id", "test-value"))
+          )
+          .use { response =>
+            IO.delay {
+              assert(response.headers.get(CaseInsensitiveString("Correlation-Id")).get.value === "test-value")
+              assert(response.headers.get(CaseInsensitiveString("Attribute-Value")).get.value === "Some(CorrelationId(test-value))")
             }
+          }
       }
       .unsafeToFuture()
   }
diff --git a/micrometer-jmx/src/main/scala/com/avast/sst/micrometer/jmx/TypeScopeNameObjectNameFactory.scala b/micrometer-jmx/src/main/scala/com/avast/sst/micrometer/jmx/TypeScopeNameObjectNameFactory.scala
index 0258d0233..dc606720d 100644
--- a/micrometer-jmx/src/main/scala/com/avast/sst/micrometer/jmx/TypeScopeNameObjectNameFactory.scala
+++ b/micrometer-jmx/src/main/scala/com/avast/sst/micrometer/jmx/TypeScopeNameObjectNameFactory.scala
@@ -35,11 +35,10 @@ private[jmx] class TypeScopeNameObjectNameFactory(separator: String = ".") exten
         override def entrySet(): util.Set[util.Map.Entry[String, String]] = map.entrySet()
       }
 
-      parts.zip(partNames).foreach {
-        case (part, partName) =>
-          val quoted = quote(part)
-          properties.put(partName, quoted)
-          map.put(partName, quoted)
+      parts.zip(partNames).foreach { case (part, partName) =>
+        val quoted = quote(part)
+        properties.put(partName, quoted)
+        map.put(partName, quoted)
       }
 
       new ObjectName(domain, properties)
diff --git a/micrometer-statsd/src/main/scala/com/avast/sst/micrometer/statsd/MicrometerStatsDModule.scala b/micrometer-statsd/src/main/scala/com/avast/sst/micrometer/statsd/MicrometerStatsDModule.scala
index fac1bcc5a..90375691c 100644
--- a/micrometer-statsd/src/main/scala/com/avast/sst/micrometer/statsd/MicrometerStatsDModule.scala
+++ b/micrometer-statsd/src/main/scala/com/avast/sst/micrometer/statsd/MicrometerStatsDModule.scala
@@ -36,9 +36,8 @@ object MicrometerStatsDModule {
 
           meterFilter.foreach(registry.config().meterFilter)
 
-          val preprocessedTags = config.commonTags.foldRight(List.empty[String]) {
-            case (tag, acc) =>
-              tag._1 :: tag._2 :: acc
+          val preprocessedTags = config.commonTags.foldRight(List.empty[String]) { case (tag, acc) =>
+            tag._1 :: tag._2 :: acc
           }
           registry.config().commonTags(preprocessedTags: _*)