diff --git a/build.sbt b/build.sbt
index 47dcc50c..f202bbc2 100644
--- a/build.sbt
+++ b/build.sbt
@@ -26,7 +26,14 @@ lazy val core = project
         compileM(cats, scodecBits, ip4s, unum, circe, scalaPb) ++
         protobufM(scalaPb),
     Compile / PB.protoSources := Seq((LocalRootProject / baseDirectory).value / "protobuf"),
-    Compile / PB.targets := Seq(scalapb.gen(flatPackage = true, grpc = false) -> (Compile / sourceManaged).value)
+    Compile / PB.targets := Seq(
+      scalapb.gen(
+        flatPackage   = true,
+        grpc          = false,
+        scala3Sources = true,
+        lenses        = false
+      ) -> (Compile / sourceManaged).value
+    )
   )
   .settings(
     mimaBinaryIssueFilters ++= Seq(
@@ -48,7 +55,11 @@ lazy val `fs2-core` = project
     libraryDependencies ++=
       compileM(grpcApi, grpcStub, grpcProtobuf, grpcCore) ++
         compileM(cats, catsEffect, fs2, ip4s, log4cats, log4catsNoop, scodecBits, circe, circeParser),
-    scalapbCodeGeneratorOptions += CodeGeneratorOption.FlatPackage,
+    scalapbCodeGeneratorOptions ++= Seq(
+      CodeGeneratorOption.FlatPackage,
+      CodeGeneratorOption.NoLenses,
+      CodeGeneratorOption.Scala3Sources
+    ),
     Compile / PB.protoSources := Seq((LocalRootProject / baseDirectory).value / "protobuf")
   )
   .settings(
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 89323b40..30680406 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,6 +1,6 @@
 addSbtPlugin("org.typelevel" % "sbt-typelevel"         % "0.6.0")
 addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.6.0")
-addSbtPlugin("org.typelevel" % "sbt-fs2-grpc"          % "2.7.10")
+addSbtPlugin("org.typelevel" % "sbt-fs2-grpc"          % "2.7.11")
 addSbtPlugin("io.spray"      % "sbt-revolver"          % "0.10.0")
 addSbtPlugin("com.eed3si9n"  % "sbt-buildinfo"         % "0.11.0")
 addSbtPlugin("org.scalameta" % "sbt-mdoc"              % "2.4.0")