diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index f548aeb7d..60f93d017 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -9,3 +9,6 @@
 
 # Scala Steward: Reformat with scalafmt 3.9.7
 33d51e84ca26e3fb58f7de9680d3722e61a89a0f
+
+# Scala Steward: Reformat with scalafmt 3.10.3
+17cfba21e1b117525d179d55580fe4320091b7ea
diff --git a/.scalafmt.conf b/.scalafmt.conf
index 9da56545e..4f0078c33 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -3,7 +3,7 @@
 # - better interop with default IntelliJ IDEA setup (matching import and modifiers sorting logic)
 # - better developer experience on laptop screens (like 16' MBPs) with IntelliJ IDEA (line wraps)
 
-version = 3.10.1
+version = 3.10.3
 
 runner.dialect = scala213source3
 
diff --git a/akka/persistence/src/main/scala/com/evolution/kafka/journal/akka/persistence/JournalAdapter.scala b/akka/persistence/src/main/scala/com/evolution/kafka/journal/akka/persistence/JournalAdapter.scala
index d6fc4b89c..f94da1d42 100644
--- a/akka/persistence/src/main/scala/com/evolution/kafka/journal/akka/persistence/JournalAdapter.scala
+++ b/akka/persistence/src/main/scala/com/evolution/kafka/journal/akka/persistence/JournalAdapter.scala
@@ -185,10 +185,11 @@ object JournalAdapter {
         for {
           key <- toKey(persistenceId)
           pointer <- journals(key).pointer
-        } yield for {
-          pointer <- pointer
-          if pointer >= from
-        } yield pointer
+        } yield
+          for {
+            pointer <- pointer
+            if pointer >= from
+          } yield pointer
       }
     }
   }
diff --git a/akka/tests/src/test/scala/com/evolution/kafka/journal/JournalSuite.scala b/akka/tests/src/test/scala/com/evolution/kafka/journal/JournalSuite.scala
index 08ca235b3..80c877e9a 100644
--- a/akka/tests/src/test/scala/com/evolution/kafka/journal/JournalSuite.scala
+++ b/akka/tests/src/test/scala/com/evolution/kafka/journal/JournalSuite.scala
@@ -134,11 +134,12 @@ object JournalSuite {
       ): F[List[EventRecord[A]]] = {
         for {
           records <- journal.read().toList
-        } yield for {
-          record <- records
-        } yield {
-          record.copy(timestamp = timestamp)
-        }
+        } yield
+          for {
+            record <- records
+          } yield {
+            record.copy(timestamp = timestamp)
+          }
       }
 
       def pointer: F[Option[SeqNr]] = journal.pointer
diff --git a/akka/tests/src/test/scala/com/evolution/kafka/journal/SettingsIntSpec.scala b/akka/tests/src/test/scala/com/evolution/kafka/journal/SettingsIntSpec.scala
index b67275e4b..a14c9bd34 100644
--- a/akka/tests/src/test/scala/com/evolution/kafka/journal/SettingsIntSpec.scala
+++ b/akka/tests/src/test/scala/com/evolution/kafka/journal/SettingsIntSpec.scala
@@ -87,29 +87,32 @@ class SettingsIntSpec extends AsyncWordSpec with BeforeAndAfterAll with Matchers
         }
         val all = for {
           settings <- settings.all.toList
-        } yield for {
-          setting <- settings
-          if setting.key =!= "schema-version"
-        } yield {
-          fix(setting)
-        }
+        } yield
+          for {
+            setting <- settings
+            if setting.key =!= "schema-version"
+          } yield {
+            fix(setting)
+          }
 
         def get(key: Setting.Key) = for {
           setting <- settings.get(key)
-        } yield for {
-          setting <- setting
-        } yield {
-          fix(setting)
-        }
-
-        def remove(key: Setting.Key) = {
+        } yield
           for {
-            setting <- settings.remove(key)
-          } yield for {
             setting <- setting
           } yield {
             fix(setting)
           }
+
+        def remove(key: Setting.Key) = {
+          for {
+            setting <- settings.remove(key)
+          } yield
+            for {
+              setting <- setting
+            } yield {
+              fix(setting)
+            }
         }
 
         for {
diff --git a/akka/tests/src/test/scala/com/evolution/kafka/journal/replicator/ReplicatorIntSpec.scala b/akka/tests/src/test/scala/com/evolution/kafka/journal/replicator/ReplicatorIntSpec.scala
index 9c8afe5b9..90644741e 100644
--- a/akka/tests/src/test/scala/com/evolution/kafka/journal/replicator/ReplicatorIntSpec.scala
+++ b/akka/tests/src/test/scala/com/evolution/kafka/journal/replicator/ReplicatorIntSpec.scala
@@ -162,11 +162,12 @@ class ReplicatorIntSpec extends AsyncWordSpec with BeforeAndAfterAll with Matche
       val recordMetadata1 = recordMetadata.withExpireAfter(expireAfter)
       for {
         partitionOffset <- journal.append(events, recordMetadata1, headers)
-      } yield for {
-        event <- events
-      } yield {
-        EventRecord(event, timestamp, partitionOffset, origin.some, version.some, recordMetadata1, headers)
-      }
+      } yield
+        for {
+          event <- events
+        } yield {
+          EventRecord(event, timestamp, partitionOffset, origin.some, version.some, recordMetadata1, headers)
+        }
     }
 
     "replicate events and expire" in {
diff --git a/cassandra/src/main/scala/com/evolution/kafka/journal/cassandra/SettingStatements.scala b/cassandra/src/main/scala/com/evolution/kafka/journal/cassandra/SettingStatements.scala
index 28855b966..44580705b 100644
--- a/cassandra/src/main/scala/com/evolution/kafka/journal/cassandra/SettingStatements.scala
+++ b/cassandra/src/main/scala/com/evolution/kafka/journal/cassandra/SettingStatements.scala
@@ -71,16 +71,17 @@ private[journal] object SettingStatements {
           .setConsistencyLevel(consistencyConfig.value)
         for {
           row <- bound.first
-        } yield for {
-          row <- row
-        } yield {
-          Setting(
-            key = key,
-            value = row.decode[Value]("value"),
-            timestamp = row.decode[Instant]("timestamp"),
-            origin = row.decode[Option[Origin]],
-          )
-        }
+        } yield
+          for {
+            row <- row
+          } yield {
+            Setting(
+              key = key,
+              value = row.decode[Value]("value"),
+              timestamp = row.decode[Instant]("timestamp"),
+              origin = row.decode[Option[Origin]],
+            )
+          }
       }
     }
   }
diff --git a/cassandra/src/main/scala/com/evolution/kafka/journal/cassandra/SettingsCassandra.scala b/cassandra/src/main/scala/com/evolution/kafka/journal/cassandra/SettingsCassandra.scala
index fbba7434b..4710b8910 100644
--- a/cassandra/src/main/scala/com/evolution/kafka/journal/cassandra/SettingsCassandra.scala
+++ b/cassandra/src/main/scala/com/evolution/kafka/journal/cassandra/SettingsCassandra.scala
@@ -19,9 +19,10 @@ private[journal] object SettingsCassandra {
     def get(key: K): F[Option[Setting]] = {
       for {
         setting <- statements.select(key)
-      } yield for {
-        setting <- setting
-      } yield setting
+      } yield
+        for {
+          setting <- setting
+        } yield setting
     }
 
     def set(key: K, value: V): F[Option[Setting]] = {
diff --git a/cassandra/src/main/scala/com/evolution/kafka/journal/eventual/cassandra/CassandraMetadata.scala b/cassandra/src/main/scala/com/evolution/kafka/journal/eventual/cassandra/CassandraMetadata.scala
index b5fb29108..234e77ceb 100644
--- a/cassandra/src/main/scala/com/evolution/kafka/journal/eventual/cassandra/CassandraMetadata.scala
+++ b/cassandra/src/main/scala/com/evolution/kafka/journal/eventual/cassandra/CassandraMetadata.scala
@@ -16,11 +16,12 @@ object CassandraMetadata {
     def keyspace(name: String): F[Option[KeyspaceMetadata[F]]] = {
       for {
         keyspace <- metadata.keyspace(name)
-      } yield for {
-        keyspace <- keyspace
-      } yield {
-        KeyspaceMetadata[F](keyspace)
-      }
+      } yield
+        for {
+          keyspace <- keyspace
+        } yield {
+          KeyspaceMetadata[F](keyspace)
+        }
     }
   }
 }
@@ -37,11 +38,12 @@ object KeyspaceMetadata {
     def table(name: String): F[Option[TableMetadata]] = {
       for {
         table <- metadata.table(name)
-      } yield for {
-        table <- table
-      } yield {
-        TableMetadata(table.name)
-      }
+      } yield
+        for {
+          table <- table
+        } yield {
+          TableMetadata(table.name)
+        }
     }
   }
 }
diff --git a/core/src/main/scala/com/evolution/kafka/journal/Origin.scala b/core/src/main/scala/com/evolution/kafka/journal/Origin.scala
index b66909ec4..ed2aa0630 100644
--- a/core/src/main/scala/com/evolution/kafka/journal/Origin.scala
+++ b/core/src/main/scala/com/evolution/kafka/journal/Origin.scala
@@ -28,10 +28,11 @@ object Origin {
   def hostName[F[_]: Sync]: F[Option[Origin]] = {
     for {
       hostName <- HostName.of[F]()
-    } yield for {
-      hostName <- hostName
-    } yield {
-      fromHostName(hostName)
-    }
+    } yield
+      for {
+        hostName <- hostName
+      } yield {
+        fromHostName(hostName)
+      }
   }
 }
diff --git a/eventual-cassandra/src/main/scala/com/evolution/kafka/journal/eventual/cassandra/MetaJournalStatements.scala b/eventual-cassandra/src/main/scala/com/evolution/kafka/journal/eventual/cassandra/MetaJournalStatements.scala
index c14c2857a..d76402e0f 100644
--- a/eventual-cassandra/src/main/scala/com/evolution/kafka/journal/eventual/cassandra/MetaJournalStatements.scala
+++ b/eventual-cassandra/src/main/scala/com/evolution/kafka/journal/eventual/cassandra/MetaJournalStatements.scala
@@ -159,11 +159,12 @@ private[journal] object MetaJournalStatements {
             .first
           for {
             row <- row
-          } yield for {
-            row <- row
-          } yield {
-            row.decode[JournalHead]
-          }
+          } yield
+            for {
+              row <- row
+            } yield {
+              row.decode[JournalHead]
+            }
         }
     }
   }
@@ -198,11 +199,12 @@ private[journal] object MetaJournalStatements {
             .first
           for {
             row <- row
-          } yield for {
-            row <- row
-          } yield {
-            JournalPointer(partitionOffset = row.decode[PartitionOffset], seqNr = row.decode[SeqNr])
-          }
+          } yield
+            for {
+              row <- row
+            } yield {
+              JournalPointer(partitionOffset = row.decode[PartitionOffset], seqNr = row.decode[SeqNr])
+            }
         }
     }
   }
diff --git a/journal/src/test/scala/com/evolution/kafka/journal/JournalSpec.scala b/journal/src/test/scala/com/evolution/kafka/journal/JournalSpec.scala
index 447771f18..7272005db 100644
--- a/journal/src/test/scala/com/evolution/kafka/journal/JournalSpec.scala
+++ b/journal/src/test/scala/com/evolution/kafka/journal/JournalSpec.scala
@@ -465,21 +465,23 @@ object JournalSpec {
         def delete(to: DeleteTo): F[Option[Offset]] = {
           for {
             partitionOffset <- journal.delete(to)
-          } yield for {
-            partitionOffset <- partitionOffset
-          } yield {
-            partitionOffset.offset
-          }
+          } yield
+            for {
+              partitionOffset <- partitionOffset
+            } yield {
+              partitionOffset.offset
+            }
         }
 
         def purge: F[Option[Offset]] = {
           for {
             partitionOffset <- journal.purge
-          } yield for {
-            partitionOffset <- partitionOffset
-          } yield {
-            partitionOffset.offset
-          }
+          } yield
+            for {
+              partitionOffset <- partitionOffset
+            } yield {
+              partitionOffset.offset
+            }
         }
       }
     }
diff --git a/pekko/persistence/src/main/scala/com/evolution/kafka/journal/pekko/persistence/JournalAdapter.scala b/pekko/persistence/src/main/scala/com/evolution/kafka/journal/pekko/persistence/JournalAdapter.scala
index d468dd608..5cd9f2700 100644
--- a/pekko/persistence/src/main/scala/com/evolution/kafka/journal/pekko/persistence/JournalAdapter.scala
+++ b/pekko/persistence/src/main/scala/com/evolution/kafka/journal/pekko/persistence/JournalAdapter.scala
@@ -185,10 +185,11 @@ object JournalAdapter {
         for {
           key <- toKey(persistenceId)
           pointer <- journals(key).pointer
-        } yield for {
-          pointer <- pointer
-          if pointer >= from
-        } yield pointer
+        } yield
+          for {
+            pointer <- pointer
+            if pointer >= from
+          } yield pointer
       }
     }
   }
diff --git a/pekko/tests/src/test/scala/com/evolution/kafka/journal/JournalSuite.scala b/pekko/tests/src/test/scala/com/evolution/kafka/journal/JournalSuite.scala
index efbcb9ead..3950c4ee3 100644
--- a/pekko/tests/src/test/scala/com/evolution/kafka/journal/JournalSuite.scala
+++ b/pekko/tests/src/test/scala/com/evolution/kafka/journal/JournalSuite.scala
@@ -134,11 +134,12 @@ object JournalSuite {
       ): F[List[EventRecord[A]]] = {
         for {
           records <- journal.read().toList
-        } yield for {
-          record <- records
-        } yield {
-          record.copy(timestamp = timestamp)
-        }
+        } yield
+          for {
+            record <- records
+          } yield {
+            record.copy(timestamp = timestamp)
+          }
       }
 
       def pointer: F[Option[SeqNr]] = journal.pointer
diff --git a/pekko/tests/src/test/scala/com/evolution/kafka/journal/SettingsIntSpec.scala b/pekko/tests/src/test/scala/com/evolution/kafka/journal/SettingsIntSpec.scala
index 82b16c6c6..afb8e3d2d 100644
--- a/pekko/tests/src/test/scala/com/evolution/kafka/journal/SettingsIntSpec.scala
+++ b/pekko/tests/src/test/scala/com/evolution/kafka/journal/SettingsIntSpec.scala
@@ -87,29 +87,32 @@ class SettingsIntSpec extends AsyncWordSpec with BeforeAndAfterAll with Matchers
         }
         val all = for {
           settings <- settings.all.toList
-        } yield for {
-          setting <- settings
-          if setting.key =!= "schema-version"
-        } yield {
-          fix(setting)
-        }
+        } yield
+          for {
+            setting <- settings
+            if setting.key =!= "schema-version"
+          } yield {
+            fix(setting)
+          }
 
         def get(key: Setting.Key) = for {
           setting <- settings.get(key)
-        } yield for {
-          setting <- setting
-        } yield {
-          fix(setting)
-        }
-
-        def remove(key: Setting.Key) = {
+        } yield
           for {
-            setting <- settings.remove(key)
-          } yield for {
             setting <- setting
           } yield {
             fix(setting)
           }
+
+        def remove(key: Setting.Key) = {
+          for {
+            setting <- settings.remove(key)
+          } yield
+            for {
+              setting <- setting
+            } yield {
+              fix(setting)
+            }
         }
 
         for {
diff --git a/pekko/tests/src/test/scala/com/evolution/kafka/journal/replicator/ReplicatorIntSpec.scala b/pekko/tests/src/test/scala/com/evolution/kafka/journal/replicator/ReplicatorIntSpec.scala
index 9c8afe5b9..90644741e 100644
--- a/pekko/tests/src/test/scala/com/evolution/kafka/journal/replicator/ReplicatorIntSpec.scala
+++ b/pekko/tests/src/test/scala/com/evolution/kafka/journal/replicator/ReplicatorIntSpec.scala
@@ -162,11 +162,12 @@ class ReplicatorIntSpec extends AsyncWordSpec with BeforeAndAfterAll with Matche
       val recordMetadata1 = recordMetadata.withExpireAfter(expireAfter)
       for {
         partitionOffset <- journal.append(events, recordMetadata1, headers)
-      } yield for {
-        event <- events
-      } yield {
-        EventRecord(event, timestamp, partitionOffset, origin.some, version.some, recordMetadata1, headers)
-      }
+      } yield
+        for {
+          event <- events
+        } yield {
+          EventRecord(event, timestamp, partitionOffset, origin.some, version.some, recordMetadata1, headers)
+        }
     }
 
     "replicate events and expire" in {
diff --git a/replicator/src/main/scala/com/evolution/kafka/journal/replicator/ReplicateRecords.scala b/replicator/src/main/scala/com/evolution/kafka/journal/replicator/ReplicateRecords.scala
index b99dda9ec..30170f9b3 100644
--- a/replicator/src/main/scala/com/evolution/kafka/journal/replicator/ReplicateRecords.scala
+++ b/replicator/src/main/scala/com/evolution/kafka/journal/replicator/ReplicateRecords.scala
@@ -99,11 +99,12 @@ private[journal] object ReplicateRecords {
                     JournalError(s"ReplicateRecords failed for id: $id, partition: $partition, offset: $offset: $e", e)
                 }
                 eventualEvents <- events.events.traverse { _.traverse { a => eventualWrite(a) } }
-              } yield for {
-                event <- eventualEvents
-              } yield {
-                EventRecord(record, event, events.metadata)
-              }
+              } yield
+                for {
+                  event <- eventualEvents
+                } yield {
+                  EventRecord(record, event, events.metadata)
+                }
             }
             expireAfter = events.last.metadata.payload.expireAfter
             result <- journal.append(offset, timestamp, expireAfter, events)
diff --git a/replicator/src/main/scala/com/evolution/kafka/journal/replicator/TopicConsumer.scala b/replicator/src/main/scala/com/evolution/kafka/journal/replicator/TopicConsumer.scala
index 39599abec..f5f59960a 100644
--- a/replicator/src/main/scala/com/evolution/kafka/journal/replicator/TopicConsumer.scala
+++ b/replicator/src/main/scala/com/evolution/kafka/journal/replicator/TopicConsumer.scala
@@ -40,11 +40,12 @@ private[journal] object TopicConsumer {
       val poll: Stream[F, Map[Partition, Nel[ConsRecord]]] = {
         val records = for {
           records <- consumer.poll(pollTimeout)
-        } yield for {
-          (partition, records) <- records.values
-        } yield {
-          (partition.partition, records)
-        }
+        } yield
+          for {
+            (partition, records) <- records.values
+          } yield {
+            (partition.partition, records)
+          }
         Stream.repeat(records)
       }