diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 92ee9d02..e3991414 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        scala: ['2.12.14', '2.13.6', '3.1.0']
+        scala: ['2.12.15', '2.13.8', '3.1.0']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/build.sbt b/build.sbt
index 168a89a2..8eaa8bcd 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,9 +1,9 @@
 val scala212 = "2.12.15"
-val scala213 = "2.13.7"
+val scala213 = "2.13.8"
 val scala3 = "3.1.0"
 
 val zioVersion = "1.0.13"
-val zio2Version = "2.0.0-RC1"
+val zio2Version = "2.0.0-RC2"
 
 val scalacOptions212 = Seq("-Ypartial-unification", "-deprecation", "-target:jvm-1.8")
 val scalacOptions213 = Seq("-deprecation", "-target:jvm-1.8")
@@ -125,7 +125,7 @@ lazy val proxZStream2 = Project("prox-zstream-2", file("prox-zstream-2")).settin
   libraryDependencies ++= Seq(
     "dev.zio" %% "zio" % zio2Version,
     "dev.zio" %% "zio-streams" % zio2Version,
-    "dev.zio" %% "zio-prelude" % "1.0.0-RC9",
+    "dev.zio" %% "zio-prelude" % "1.0.0-RC10",
 
     "dev.zio" %% "zio-test" % zio2Version % "test",
     "dev.zio" %% "zio-test-sbt" % zio2Version % "test",
diff --git a/prox-zstream-2/src/test/scala/io/github/vigoo/prox/tests/zstream/ProcessGroupSpecs.scala b/prox-zstream-2/src/test/scala/io/github/vigoo/prox/tests/zstream/ProcessGroupSpecs.scala
index 7fca0cea..a54a5d3f 100644
--- a/prox-zstream-2/src/test/scala/io/github/vigoo/prox/tests/zstream/ProcessGroupSpecs.scala
+++ b/prox-zstream-2/src/test/scala/io/github/vigoo/prox/tests/zstream/ProcessGroupSpecs.scala
@@ -199,7 +199,7 @@ object ProcessGroupSpecs extends DefaultRunnableSpec with ProxSpecHelpers {
           val p1 = Process("perl", List("-e", """print STDERR "Hello""""))
           val p2 = Process("perl", List("-e", """print STDERR "world!""""))
 
-          val stream = ZPipeline.utf8Decode >>> ZPipeline.splitLines >>> ZPipeline.map(_.length)
+          val stream = ZPipeline.utf8Decode >>> ZPipeline.splitLines >>> ZPipeline.map[String, Int](_.length)
 
           val processGroup = (p1 | p2) !>? stream
           val program = processGroup.run()
@@ -299,7 +299,7 @@ object ProcessGroupSpecs extends DefaultRunnableSpec with ProxSpecHelpers {
           val p1 = Process("perl", List("-e", """print STDERR "Hello""""))
           val p2 = Process("perl", List("-e", """print STDERR "world!""""))
 
-          val stream = ZPipeline.utf8Decode >>> ZPipeline.splitLines >>> ZPipeline.map(_.length)
+          val stream = ZPipeline.utf8Decode >>> ZPipeline.splitLines >>> ZPipeline.map[String, Int](_.length)
 
           val processGroup = (p1 | p2).customizedPerProcess.errorsToVector {
             case p if p == p1 => stream >>> ZPipeline.map(l => (1, l))
@@ -339,7 +339,7 @@ object ProcessGroupSpecs extends DefaultRunnableSpec with ProxSpecHelpers {
           val processGroup = (p1 | p2).customizedPerProcess.foldErrors(
             {
               case p if p == p1 => ZPipeline.utf8Decode >>> ZPipeline.splitLines
-              case p if p == p2 => ZPipeline.utf8Decode >>> ZPipeline.splitLines >>> ZPipeline.map(_.reverse)
+              case p if p == p2 => ZPipeline.utf8Decode >>> ZPipeline.splitLines >>> ZPipeline.map[String, String](_.reverse)
             },
             Vector.empty,
             (l: Vector[Option[Char]], s: String) => l :+ s.headOption
diff --git a/prox-zstream-2/src/test/scala/io/github/vigoo/prox/tests/zstream/ProcessSpecs.scala b/prox-zstream-2/src/test/scala/io/github/vigoo/prox/tests/zstream/ProcessSpecs.scala
index eebab17d..3061de04 100644
--- a/prox-zstream-2/src/test/scala/io/github/vigoo/prox/tests/zstream/ProcessSpecs.scala
+++ b/prox-zstream-2/src/test/scala/io/github/vigoo/prox/tests/zstream/ProcessSpecs.scala
@@ -73,7 +73,7 @@ object ProcessSpecs extends DefaultRunnableSpec with ProxSpecHelpers {
           val stream =
             ZPipeline.utf8Decode >>>
               ZPipeline.splitLines >>>
-              ZPipeline.map(s => StringLength(s.length))
+              ZPipeline.map[String, StringLength](s => StringLength(s.length))
 
           val process = Process("echo", List("Hello\nworld!")) >? stream
           val program = process.run().map(_.output)
@@ -156,7 +156,7 @@ object ProcessSpecs extends DefaultRunnableSpec with ProxSpecHelpers {
           val stream =
             ZPipeline.utf8Decode >>>
               ZPipeline.splitLines >>>
-              ZPipeline.map(s => StringLength(s.length))
+              ZPipeline.map[String, StringLength](s => StringLength(s.length))
 
           val process = Process("perl", List("-e", "print STDERR 'Hello\nworld!'")) !>? stream
           val program = process.run().map(_.error)