diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 0076561bd..cfd502190 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -73,7 +73,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        SCALA_VERSION: [2.12, 2.13]
+        SCALA_VERSION: [2.12, 2.13, 3.3]
         JAVA_VERSION: [8, 11]
     steps:
       - name: Checkout
@@ -105,8 +105,6 @@ jobs:
             scala-version: 2.12
           - test-set: gen-java
             scala-version: 2.12
-          - test-set: scala3
-            scala-version: 3.3
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -149,7 +147,7 @@ jobs:
           cat ~/.version
 
       - name: Cache local Gradle repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
@@ -205,7 +203,7 @@ jobs:
           cat ~/.version
 
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('plugin-tester-*/pom.xml') }}
diff --git a/.github/workflows/link-validator.yml b/.github/workflows/link-validator.yml
index aa2e2b71f..90573ebbf 100644
--- a/.github/workflows/link-validator.yml
+++ b/.github/workflows/link-validator.yml
@@ -2,6 +2,7 @@ name: Link Validator
 
 on:
   pull_request:
+  workflow_dispatch:
   schedule:
     - cron:  '0 6 * * 1'
 
@@ -17,23 +18,23 @@ jobs:
           # fetch everything https://github.com/actions/checkout#fetch-all-history-for-all-tags-and-branches
           fetch-depth: 0
 
-      - name: Setup Java 8
+      - name: Setup Java 11
         uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 11
 
       - name: Cache Coursier cache
-        uses: coursier/cache-action@v6
+        uses: coursier/cache-action@v6.4.0
+
+      - name: Setup Coursier
+        uses: coursier/setup-action@v1.3.3
 
       - name: sbt site
         run: sbt docs/makeSite
 
-      - name: Install Coursier command line tool
-        run: curl -fLo cs https://git.io/coursier-cli-linux && chmod +x cs && ./cs
-
       - name: Run Link Validator
         run: |
           VERSION=$(ls docs/target/site/docs/pekko-grpc)
           sed -e "s/snapshot/$VERSION/" scripts/link-validator.conf > /tmp/link-validator.conf
-          ./cs launch net.runne::site-link-validator:0.2.0 -- /tmp/link-validator.conf
+          cs launch net.runne::site-link-validator:0.2.2 -- /tmp/link-validator.conf
diff --git a/benchmark-java/project/build.properties b/benchmark-java/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/benchmark-java/project/build.properties
+++ b/benchmark-java/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/benchmarks/src/main/scala/org/apache/pekko/grpc/BenchRunner.scala b/benchmarks/src/main/scala/org/apache/pekko/grpc/BenchRunner.scala
index abedb4ba5..0fcb42392 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/grpc/BenchRunner.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/grpc/BenchRunner.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/grpc/CommonBenchmark.scala b/benchmarks/src/main/scala/org/apache/pekko/grpc/CommonBenchmark.scala
index 122f4b7d1..4babe8e02 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/grpc/CommonBenchmark.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/grpc/CommonBenchmark.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/grpc/GrpcMarshallingBenchmark.scala b/benchmarks/src/main/scala/org/apache/pekko/grpc/GrpcMarshallingBenchmark.scala
index 9100cf5ba..c666f8246 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/grpc/GrpcMarshallingBenchmark.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/grpc/GrpcMarshallingBenchmark.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/grpc/HandlerProcessingBenchmark.scala b/benchmarks/src/main/scala/org/apache/pekko/grpc/HandlerProcessingBenchmark.scala
index 924b6b7ba..0e8ed5294 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/grpc/HandlerProcessingBenchmark.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/grpc/HandlerProcessingBenchmark.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/build.sbt b/build.sbt
index 9cd7be53e..1a1eac37a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,3 +1,12 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * license agreements; and to You under the Apache License, version 2.0:
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * This file is part of the Apache Pekko project, derived from Akka.
+ */
+
 import org.apache.pekko.grpc.Dependencies
 import org.apache.pekko.grpc.Dependencies.Versions.{ scala212, scala213 }
 import org.apache.pekko.grpc.ProjectExtensions._
@@ -7,9 +16,16 @@ import com.typesafe.tools.mima.core._
 import sbt.Keys.scalaVersion
 
 ThisBuild / apacheSonatypeProjectProfile := "pekko"
-sourceDistName := "incubating-pekko-grpc"
+sourceDistName := "apache-pekko-grpc"
+sourceDistIncubating := true
 ThisBuild / versionScheme := Some(VersionScheme.SemVerSpec)
 
+commands := commands.value.filterNot { command =>
+  command.nameOption.exists { name =>
+    name.contains("sonatypeRelease") || name.contains("sonatypeBundleRelease")
+  }
+}
+
 val pekkoPrefix = "pekko-grpc"
 val pekkoGrpcRuntimeName = s"$pekkoPrefix-runtime"
 
@@ -18,8 +34,9 @@ lazy val mkBatAssemblyTask = taskKey[File]("Create a Windows bat assembly")
 // gradle plugin compatibility (avoid `+` in snapshot versions)
 (ThisBuild / dynverSeparator) := "-"
 
+// TODO remove these resolvers when we start using released Pekko jars
 ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo
-ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshot") // TODO Remove when proper release of pekko-http-cors is made
+ThisBuild / updateOptions := updateOptions.value.withLatestSnapshots(false)
 
 val pekkoGrpcCodegenId = s"$pekkoPrefix-codegen"
 lazy val codegen = Project(id = "codegen", base = file("codegen"))
@@ -203,9 +220,9 @@ lazy val docs = Project(id = "docs", base = file("docs"))
       "canonical.base_url" -> "https://pekko.apache.org/docs/pekko-grpc/current",
       "scaladoc.scala.base_url" -> s"https://www.scala-lang.org/api/current/",
       // Apache Pekko
-      "extref.pekko.base_url" -> s"https://pekko.apache.org/docs/pekko-grpc/current/%s",
-      "scaladoc.pekko.base_url" -> "https://pekko.apache.org/docs/pekko-grpc/current/",
-      "javadoc.pekko.base_url" -> "https://pekko.apache.org/docs/pekko-grpc/current/",
+      "extref.pekko.base_url" -> s"https://pekko.apache.org/docs/pekko/current/%s",
+      "scaladoc.pekko.base_url" -> "https://pekko.apache.org/docs/pekko/current/",
+      "javadoc.pekko.base_url" -> "https://pekko.apache.org/docs/pekko/current/",
       // Apache Pekko HTTP
       "extref.pekko-http.base_url" -> s"https://pekko.apache.org/docs/pekko-http/${Dependencies.Versions.pekkoHttpBinary}/%s",
       "scaladoc.pekko-http.base_url" -> s"https://pekko.apache.org/api/pekko-http/${Dependencies.Versions.pekkoHttpBinary}/",
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/CodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/CodeGenerator.scala
index 683457d1d..5e758e4df 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/CodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/CodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Constants.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Constants.scala
index 3eb2b3e39..051dc1894 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Constants.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Constants.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Logging.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Logging.scala
index 3506f510f..76d6ec755 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Logging.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Logging.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Main.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Main.scala
index 8f97954fe..bfe29ea81 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Main.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Main.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/MethodType.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/MethodType.scala
index 84c76ab3e..45d39fe71 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/MethodType.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/MethodType.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/ProtocSettings.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/ProtocSettings.scala
index 703e16420..00f7dad84 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/ProtocSettings.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/ProtocSettings.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaClientCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaClientCodeGenerator.scala
index d1ea149bd..2fe48f5b1 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaClientCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaClientCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaCodeGenerator.scala
index 43730d158..02f10f9a9 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala
index 08e8e0052..ca731979f 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaServerCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaServerCodeGenerator.scala
index 91ca91cee..bb0f95a8b 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaServerCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaServerCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Method.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Method.scala
index e068cb6b3..e8ef2e8e5 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Method.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Method.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Serializer.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Serializer.scala
index c484032e8..4db13e1f7 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Serializer.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Serializer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Service.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Service.scala
index f77098629..b3603f314 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Service.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Service.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Method.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Method.scala
index 93ba82194..96dda0809 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Method.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Method.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala
index 844c5a41f..678bb3672 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaCodeGenerator.scala
index 9c67b38af..65a61c0a2 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala
index a9f59d1b1..57442e18d 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala
index 7600d59da..be053dc30 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala
index 488a45bb6..9513e4eaa 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Serializer.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Serializer.scala
index 9bfcef2b6..3d5040b87 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Serializer.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Serializer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala
index eaae97a27..949618075 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/twirl/templates/JavaClient/Client.scala.txt b/codegen/src/main/twirl/templates/JavaClient/Client.scala.txt
index 48bdb17d5..4ac7787c1 100644
--- a/codegen/src/main/twirl/templates/JavaClient/Client.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaClient/Client.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/JavaClient/ClientPowerApi.scala.txt b/codegen/src/main/twirl/templates/JavaClient/ClientPowerApi.scala.txt
index 8756bc7b9..82dba0a63 100644
--- a/codegen/src/main/twirl/templates/JavaClient/ClientPowerApi.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaClient/ClientPowerApi.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt b/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt
index 068943401..b570aab0e 100644
--- a/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/JavaCommon/ApiInterface.scala.txt b/codegen/src/main/twirl/templates/JavaCommon/ApiInterface.scala.txt
index 1e8d8f16c..6f65307ae 100644
--- a/codegen/src/main/twirl/templates/JavaCommon/ApiInterface.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaCommon/ApiInterface.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/JavaServer/Handler.scala.txt b/codegen/src/main/twirl/templates/JavaServer/Handler.scala.txt
index 517e4d1df..de2467014 100644
--- a/codegen/src/main/twirl/templates/JavaServer/Handler.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaServer/Handler.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/JavaServer/PowerApiInterface.scala.txt b/codegen/src/main/twirl/templates/JavaServer/PowerApiInterface.scala.txt
index 3f3aba8dc..4fb1cb6ea 100644
--- a/codegen/src/main/twirl/templates/JavaServer/PowerApiInterface.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaServer/PowerApiInterface.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt b/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt
index b4fd53b63..c59c55916 100644
--- a/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt
+++ b/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/ScalaCommon/ApiTrait.scala.txt b/codegen/src/main/twirl/templates/ScalaCommon/ApiTrait.scala.txt
index e06c0982d..7de502e15 100644
--- a/codegen/src/main/twirl/templates/ScalaCommon/ApiTrait.scala.txt
+++ b/codegen/src/main/twirl/templates/ScalaCommon/ApiTrait.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/ScalaCommon/Marshallers.scala.txt b/codegen/src/main/twirl/templates/ScalaCommon/Marshallers.scala.txt
index 167c4e89e..b531649e7 100644
--- a/codegen/src/main/twirl/templates/ScalaCommon/Marshallers.scala.txt
+++ b/codegen/src/main/twirl/templates/ScalaCommon/Marshallers.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt b/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt
index 55ce73e1e..a5ce73938 100644
--- a/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt
+++ b/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/ScalaServer/PowerApiTrait.scala.txt b/codegen/src/main/twirl/templates/ScalaServer/PowerApiTrait.scala.txt
index 631e5e3f5..962edee02 100644
--- a/codegen/src/main/twirl/templates/ScalaServer/PowerApiTrait.scala.txt
+++ b/codegen/src/main/twirl/templates/ScalaServer/PowerApiTrait.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/test/scala/org/apache/pekko/grpc/gen/javadsl/ServiceSpec.scala b/codegen/src/test/scala/org/apache/pekko/grpc/gen/javadsl/ServiceSpec.scala
index 11f1722de..0064f433f 100644
--- a/codegen/src/test/scala/org/apache/pekko/grpc/gen/javadsl/ServiceSpec.scala
+++ b/codegen/src/test/scala/org/apache/pekko/grpc/gen/javadsl/ServiceSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/docs/src/main/paradox/_template/projectSpecificFooter.st b/docs/src/main/paradox/_template/projectSpecificFooter.st
deleted file mode 100644
index c4a9441f3..000000000
--- a/docs/src/main/paradox/_template/projectSpecificFooter.st
+++ /dev/null
@@ -1,4 +0,0 @@
-<script type="text/javascript" src="$page.base$assets/js/warnOldVersion.js"></script>
-<script type="text/javascript">//<![CDATA[
-jQuery(function(jq){initOldVersionWarnings(jq, '$page.properties.("project.version")$', '$page.properties.("project.url")$')});
-//]]></script>
diff --git a/docs/src/main/paradox/apidesign.md b/docs/src/main/paradox/apidesign.md
index 588ceced7..e45a1dc89 100644
--- a/docs/src/main/paradox/apidesign.md
+++ b/docs/src/main/paradox/apidesign.md
@@ -7,7 +7,7 @@ When designing a gRPC API, you could take into consideration some of the
 
 If you want to create an endpoint that takes no parameters or produces no
 response, it might be tempting to use the `Empty` type as defined by
-Google in their [empty.proto](https://github.com/protocolbuffers/protobuf/blob/master/src/google/protobuf/empty.proto).
+Google in their [empty.proto](https://github.com/protocolbuffers/protobuf/blob/main/src/google/protobuf/empty.proto).
 
 It is recommended to introduce your own (empty) message types, however, as
 functionality may grow and this prepares you for adding additional (optional) fields
@@ -15,14 +15,14 @@ over time.
 
 ## Declare and enforce constraints for your request and response payloads with `protoc-gen-validate`
 
-[`protoc-gen-validate` (PGV)](https://github.com/envoyproxy/protoc-gen-validate) defines
+[`protoc-gen-validate` (PGV)](https://github.com/bufbuild/protoc-gen-validate) defines
 a set of Protobuf options allowing to add additional rules on messages and fields in a declarative
 fashion. A set of validators for different languages is also provided, to enforce these rules at
 runtime.
 
 ### Java support
 
-Validators for Java stubs are provided by [the project itself](https://github.com/envoyproxy/protoc-gen-validate#java).
+Validators for Java stubs are provided by [the project itself](https://github.com/bufbuild/protoc-gen-validate#java).
 
 Follow the instructions there for Maven and Gradle. If your are using sbt, you can get
 `validate.proto` into the include path and run the protoc plugin generating the validators
diff --git a/docs/src/main/paradox/assets/js/warnOldVersion.js b/docs/src/main/paradox/assets/js/warnOldVersion.js
deleted file mode 100644
index 39da3c3ce..000000000
--- a/docs/src/main/paradox/assets/js/warnOldVersion.js
+++ /dev/null
@@ -1,23 +0,0 @@
-function initOldVersionWarnings($, thisVersion, projectUrl) {
-    if (projectUrl && projectUrl !== "") {
-        var schemeLessUrl = projectUrl;
-        if (projectUrl.startsWith("http://")) projectUrl = schemeLessUrl.substring(5);
-        else if (projectUrl.startsWith("https://")) projectUrl = schemeLessUrl.substring(6);
-        const url = schemeLessUrl + (schemeLessUrl.endsWith("\/") ? "" : "/") + "paradox.json";
-        $.get(url, function (versionData) {
-            const currentVersion = versionData.version;
-            if (thisVersion !== currentVersion) {
-                showVersionWarning(thisVersion, currentVersion, projectUrl);
-            }
-        });
-    }
-}
-
-function showVersionWarning(thisVersion, currentVersion, projectUrl) {
-    $('#docs').prepend(
-        '<div class="callout warning" style="margin-top: 16px">' +
-        '<p><span style="font-weight: bold">This documentation regards version ' + thisVersion + ', ' +
-        'however the current version is <a href="' + projectUrl + '">' + currentVersion + '</a>.</span></p>' +
-        '</div>'
-    );
-}
\ No newline at end of file
diff --git a/docs/src/main/paradox/buildtools/gradle.md b/docs/src/main/paradox/buildtools/gradle.md
index 83a2013cd..366c2e8ce 100644
--- a/docs/src/main/paradox/buildtools/gradle.md
+++ b/docs/src/main/paradox/buildtools/gradle.md
@@ -1,6 +1,6 @@
 # Gradle
 
-To get started with Pekko gRPC read the @ref[client](../client/index.md) or @ref[server](../server/index.md) introductions.
+To get started with Pekko gRPC, read the @ref[client](../client/index.md) or @ref[server](../server/index.md) introductions.
 
 ## Configuring plugin
 
@@ -9,10 +9,12 @@ Most of the settings could be configured using related setting of `protobuf-grad
 Consult [protobuf-gradle-plugin](https://github.com/google/protobuf-gradle-plugin#protobuf-plugin-for-gradle-) documentation for details.
 
 The plugin can generate either Java or Scala classes, and then server and or client for the corresponding language.
-By default both client and server are generated and Java or Scala is autodetected depending on the presence of source files with language extension in `src/main`.
+By default, both client and server are generated and Java or Scala is autodetected depending on the presence of source files with language extension in `src/main`.
 
 ### Installation
 
+**The Gradle plugin is not yet deployed to plugins.gradle.org.**
+
 Follow instructions at [Gradle plugin portal](https://plugins.gradle.org/plugin/org.apache.pekko.grpc.gradle) to apply plugin.
 
 ### Available plugin options
@@ -99,4 +101,4 @@ Then, the server can then be started from the command line with:
 
 ## Play Framework support
 
-See the [Play gRPC documentation](https://developer.lightbend.com/docs/play-grpc/current/play/gradle-support.html) for details.
+See the [Play gRPC documentation](https://github.com/playframework/play-grpc) for details.
diff --git a/docs/src/main/paradox/client/details.md b/docs/src/main/paradox/client/details.md
index 02d0d5180..d22864e8a 100644
--- a/docs/src/main/paradox/client/details.md
+++ b/docs/src/main/paradox/client/details.md
@@ -76,7 +76,7 @@ Java
 
 ## Rich error model
 
-Beyond status codes you can also use the [Rich error model](https://www.grpc.io/docs/guides/error/#richer-error-model). Currently there is no particular support for consuming such error objects (such as the ones based on the [common protobuf](https://cloud.google.com/apis/design/errors#error_model), but you can obtain them 'manually'.
+Beyond status codes you can also use the [Rich error model](https://grpc.io/docs/guides/error/#richer-error-model). Currently there is no particular support for consuming such error objects (such as the ones based on the [common protobuf](https://cloud.google.com/apis/design/errors#error_model), but you can obtain them 'manually'.
 
 Extract the `StatusRuntimeException` and parse the Rich error model to access `code`, `message` and `details`. Then find the details you are looking for based on their `typeUrl` and unpack them:
 
diff --git a/docs/src/main/paradox/overview.md b/docs/src/main/paradox/overview.md
index 971d8745d..841f5d313 100644
--- a/docs/src/main/paradox/overview.md
+++ b/docs/src/main/paradox/overview.md
@@ -23,7 +23,7 @@ It features:
     - @extref[Pekko HTTP/2 support](pekko-http:server-side/http2.html) for the server side and 
     - `grpc-netty-shaded` for the client side.
  * Support for @ref[sbt](buildtools/sbt.md), @ref[gradle](buildtools/gradle.md), @ref[Maven](buildtools/maven.md),
-   and the [Play Framework](https://developer.lightbend.com/docs/play-grpc/current/).
+   and the [Play Framework](https://github.com/playframework/play-grpc).
 
 ## Project Information
 
diff --git a/docs/src/main/paradox/proto.md b/docs/src/main/paradox/proto.md
index 4da9c593c..3adb34740 100644
--- a/docs/src/main/paradox/proto.md
+++ b/docs/src/main/paradox/proto.md
@@ -3,7 +3,7 @@
 gRPC uses the Protobuf `.proto` file format to define your messages, services
 and some aspects of the code generation.
 
-For an in-depth description see the [Protocol buffers documentation](https://developers.google.com/protocol-buffers/docs/proto3),
+For an in-depth description see the [Protocol buffers documentation](https://protobuf.dev/programming-guides/proto3),
 but here are a few quick examples:
 
 ## Messages
@@ -26,7 +26,7 @@ There are a number of options that can be set in the `.proto` definition that in
 
 @@snip [helloworld.proto](/plugin-tester-scala/src/main/protobuf/helloworld.proto) { #options }
 
-The (optional) [`package`](https://developers.google.com/protocol-buffers/docs/proto3#packages)
+The (optional) [`package`](https://protobuf.dev/programming-guides/proto3#packages)
 in the `.proto` is used to resolve references from one `.proto` file to another.
 It can also be used for the package name in the generated code, but it is
 common to use the separate `java_package` option to override it. In the Pekko gRPC
diff --git a/docs/src/main/paradox/server/details.md b/docs/src/main/paradox/server/details.md
index 1a4b4da26..f3f473422 100644
--- a/docs/src/main/paradox/server/details.md
+++ b/docs/src/main/paradox/server/details.md
@@ -44,7 +44,7 @@ Java
 :   @@snip[ExceptionGreeterServiceImpl](/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java) { #streaming }
 
 ## Rich error model
-Beyond status codes you can also use the [Rich error model](https://www.grpc.io/docs/guides/error/#richer-error-model).  
+Beyond status codes you can also use the [Rich error model](https://grpc.io/docs/guides/error/#richer-error-model).  
 
 This example uses an error model taken from [common protobuf](https://github.com/googleapis/googleapis/blob/master/google/rpc/error_details.proto) but every class that is based on `scalapb.GeneratedMessage` can be used. Build and return the error as a `PekkoGrpcException`:
 
diff --git a/docs/src/main/paradox/server/grpc-web.md b/docs/src/main/paradox/server/grpc-web.md
index 4b2b1f82f..99c3477bc 100644
--- a/docs/src/main/paradox/server/grpc-web.md
+++ b/docs/src/main/paradox/server/grpc-web.md
@@ -37,9 +37,9 @@ gRPC-Web endpoint with basic CORS infrastructure in place. To use CORS,
 you will need to add the pekko-http-cors dependency to your project:
 
 @@dependency[sbt,Maven,Gradle] {
-  group="ch.megard"
-  artifact="pekko-http-cors_2.12"
-  version="0.0.0-SNAPSHOT" // Update when proper release of pekko-http-cors is made
+  group="org.apache.pekko"
+  artifact="pekko-http-cors_$scala.binary.version$"
+  version="$pekko-http.version$"
 }
 
 And then serve the handlers with @apidoc[WebHandler.grpcWebHandler](WebHandler$) like this:
diff --git a/docs/src/main/paradox/server/kubernetes.md b/docs/src/main/paradox/server/kubernetes.md
index 6ba8625c5..f144f6224 100644
--- a/docs/src/main/paradox/server/kubernetes.md
+++ b/docs/src/main/paradox/server/kubernetes.md
@@ -10,7 +10,7 @@ There are 3 ways to use HTTP/2:
 * HTTP/2 over plaintext TCP ('h2c'), without negotiation. This assumes the client has prior knowledge that the server supports HTTP/2.
 
 A straightforward way to expose a TCP endpoint outside the cluster is to create a Kubernetes `Service` of type `LoadBalancer`. Beyond that, Kubernetes supports many types of [Ingress Controllers](https://kubernetes.io/docs/concepts/services-networking/ingress-controllers/).
-[GCE](https://github.com/kubernetes/ingress-gce/blob/master/README.md) and [NGINX](https://github.com/kubernetes/ingress-nginx/blob/master/README.md)
+[GCE](https://github.com/kubernetes/ingress-gce/blob/master/README.md) and [NGINX](https://github.com/kubernetes/ingress-nginx/blob/main/README.md)
 are the most widely known.
 
 ## LoadBalancer Service
diff --git a/docs/src/main/paradox/server/pekko-http.md b/docs/src/main/paradox/server/pekko-http.md
index 945b6d65e..9150b07c6 100644
--- a/docs/src/main/paradox/server/pekko-http.md
+++ b/docs/src/main/paradox/server/pekko-http.md
@@ -1,6 +1,6 @@
 # Pekko HTTP interop
 
-Pekko gRPC is built on top of [Pekko HTTP](https://pekko.apache.org/docs/pekko-http).
+Pekko gRPC is built on top of @extref[Pekko HTTP](pekko-http:).
 This means it is possible to leverage the Pekko HTTP API's to create more
 complicated services, for example serving non-gRPC endpoints next to
 gRPC endpoints or adding additional behavior around your gRPC routes.
@@ -125,7 +125,7 @@ We make three calls: one with a valid name, one with a lowercase name, and one w
 For the valid name, the RPC succeeds and the server prints only the response log:
 
 ```
-[INFO] [05/15/2022 09:24:36.850] [Server-akka.actor.default-dispatcher-8] [akka.actor.ActorSystemImpl(Server)] loggingErrorHandlingGrpcRoute: Response for
+[INFO] [05/15/2022 09:24:36.850] [Server-pekko.actor.default-dispatcher-8] [org.apache.pekko.actor.ActorSystemImpl(Server)] loggingErrorHandlingGrpcRoute: Response for
   Request : HttpRequest(HttpMethod(POST),http://127.0.0.1/helloworld.GreeterService/SayHello,Vector(TE: trailers, User-Agent: grpc-java-netty/1.45.1, grpc-accept-encoding: gzip),HttpEntity.Chunked(application/grpc),HttpProtocol(HTTP/2.0))
   Response: Complete(HttpResponse(200 OK,List(grpc-encoding: gzip),HttpEntity.Strict(application/grpc+proto,42 bytes total),HttpProtocol(HTTP/1.1)))
 ```
@@ -135,27 +135,27 @@ Note that the server still returns a status code 200, even though the RPC failed
 This is because gRPC encodes a failure as a successful HTTP response containing the error in the body.
 
 ```
-[ERROR] [05/15/2022 09:24:36.902] [Server-akka.actor.default-dispatcher-5] [akka.actor.ActorSystemImpl(Server)] Grpc failure handled and mapped to akka.grpc.Trailers@4ab49ff7
+[ERROR] [05/15/2022 09:24:36.902] [Server-pekko.actor.default-dispatcher-5] [org.apache.pekko.actor.ActorSystemImpl(Server)] Grpc failure handled and mapped to akka.grpc.Trailers@4ab49ff7
 java.lang.IllegalArgumentException: Name must be capitalized
 	at example.myapp.helloworld.LoggingErrorHandlingGreeterServer$Impl$1.sayHello(LoggingErrorHandlingGreeterServer.scala:43)
 	at example.myapp.helloworld.grpc.GreeterServiceHandler$.$anonfun$partial$2(GreeterServiceHandler.scala:118)
 	at scala.concurrent.Future.$anonfun$flatMap$1(Future.scala:307)
 	at scala.concurrent.impl.Promise.$anonfun$transformWith$1(Promise.scala:41)
 	at scala.concurrent.impl.CallbackRunnable.run(Promise.scala:64)
-	at akka.dispatch.BatchingExecutor$AbstractBatch.processBatch(BatchingExecutor.scala:56)
-	at akka.dispatch.BatchingExecutor$BlockableBatch.$anonfun$run$1(BatchingExecutor.scala:93)
+	at org.apache.pekko.dispatch.BatchingExecutor$AbstractBatch.processBatch(BatchingExecutor.scala:56)
+	at org.apache.pekko.dispatch.BatchingExecutor$BlockableBatch.$anonfun$run$1(BatchingExecutor.scala:93)
 	at scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.java:23)
 	at scala.concurrent.BlockContext$.withBlockContext(BlockContext.scala:85)
-	at akka.dispatch.BatchingExecutor$BlockableBatch.run(BatchingExecutor.scala:93)
-	at akka.dispatch.TaskInvocation.run(AbstractDispatcher.scala:48)
-	at akka.dispatch.ForkJoinExecutorConfigurator$AkkaForkJoinTask.exec(ForkJoinExecutorConfigurator.scala:48)
+	at org.apache.pekko.dispatch.BatchingExecutor$BlockableBatch.run(BatchingExecutor.scala:93)
+	at org.apache.pekko.dispatch.TaskInvocation.run(AbstractDispatcher.scala:48)
+	at org.apache.pekko.dispatch.ForkJoinExecutorConfigurator$AkkaForkJoinTask.exec(ForkJoinExecutorConfigurator.scala:48)
 	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290)
 	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1020)
 	at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1656)
 	at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1594)
 	at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:183)
 
-[INFO] [05/15/2022 09:24:36.905] [Server-akka.actor.default-dispatcher-5] [akka.actor.ActorSystemImpl(Server)] loggingErrorHandlingGrpcRoute: Response for
+[INFO] [05/15/2022 09:24:36.905] [Server-pekko.actor.default-dispatcher-5] [org.apache.pekko.actor.ActorSystemImpl(Server)] loggingErrorHandlingGrpcRoute: Response for
   Request : HttpRequest(HttpMethod(POST),http://127.0.0.1/helloworld.GreeterService/SayHello,Vector(TE: trailers, User-Agent: grpc-java-netty/1.45.1, grpc-accept-encoding: gzip),HttpEntity.Chunked(application/grpc),HttpProtocol(HTTP/2.0))
   Response: Complete(HttpResponse(200 OK,List(grpc-encoding: gzip),HttpEntity.Chunked(application/grpc+proto),HttpProtocol(HTTP/1.1)))
 ```
@@ -163,7 +163,7 @@ java.lang.IllegalArgumentException: Name must be capitalized
 For the empty name, the server prints a slightly different error log and the response log, 
 
 ```
-[ERROR] [05/15/2022 09:24:36.914] [Server-akka.actor.default-dispatcher-5] [akka.actor.ActorSystemImpl(Server)] Grpc failure UNHANDLED and mapped to akka.grpc.Trailers@5e1d9001
+[ERROR] [05/15/2022 09:24:36.914] [Server-pekko.actor.default-dispatcher-5] [org.apache.pekko.actor.ActorSystemImpl(Server)] Grpc failure UNHANDLED and mapped to akka.grpc.Trailers@5e1d9001
 java.util.NoSuchElementException: next on empty iterator
 	at scala.collection.Iterator$$anon$2.next(Iterator.scala:41)
 	at scala.collection.Iterator$$anon$2.next(Iterator.scala:39)
@@ -178,20 +178,20 @@ java.util.NoSuchElementException: next on empty iterator
 	at scala.concurrent.Future.$anonfun$flatMap$1(Future.scala:307)
 	at scala.concurrent.impl.Promise.$anonfun$transformWith$1(Promise.scala:41)
 	at scala.concurrent.impl.CallbackRunnable.run(Promise.scala:64)
-	at akka.dispatch.BatchingExecutor$AbstractBatch.processBatch(BatchingExecutor.scala:56)
-	at akka.dispatch.BatchingExecutor$BlockableBatch.$anonfun$run$1(BatchingExecutor.scala:93)
+	at org.apache.pekko.dispatch.BatchingExecutor$AbstractBatch.processBatch(BatchingExecutor.scala:56)
+	at org.apache.pekko.dispatch.BatchingExecutor$BlockableBatch.$anonfun$run$1(BatchingExecutor.scala:93)
 	at scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.java:23)
 	at scala.concurrent.BlockContext$.withBlockContext(BlockContext.scala:85)
-	at akka.dispatch.BatchingExecutor$BlockableBatch.run(BatchingExecutor.scala:93)
-	at akka.dispatch.TaskInvocation.run(AbstractDispatcher.scala:48)
-	at akka.dispatch.ForkJoinExecutorConfigurator$AkkaForkJoinTask.exec(ForkJoinExecutorConfigurator.scala:48)
+	at org.apache.pekko.dispatch.BatchingExecutor$BlockableBatch.run(BatchingExecutor.scala:93)
+	at org.apache.pekko.dispatch.TaskInvocation.run(AbstractDispatcher.scala:48)
+	at org.apache.pekko.dispatch.ForkJoinExecutorConfigurator$AkkaForkJoinTask.exec(ForkJoinExecutorConfigurator.scala:48)
 	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290)
 	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1020)
 	at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1656)
 	at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1594)
 	at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:183)
 
-[INFO] [05/15/2022 09:24:36.914] [Server-akka.actor.default-dispatcher-5] [akka.actor.ActorSystemImpl(Server)] loggingErrorHandlingGrpcRoute: Response for
+[INFO] [05/15/2022 09:24:36.914] [Server-pekko.actor.default-dispatcher-5] [org.apache.pekko.actor.ActorSystemImpl(Server)] loggingErrorHandlingGrpcRoute: Response for
   Request : HttpRequest(HttpMethod(POST),http://127.0.0.1/helloworld.GreeterService/SayHello,Vector(TE: trailers, User-Agent: grpc-java-netty/1.45.1, grpc-accept-encoding: gzip),HttpEntity.Chunked(application/grpc),HttpProtocol(HTTP/2.0))
   Response: Complete(HttpResponse(200 OK,List(grpc-encoding: gzip),HttpEntity.Chunked(application/grpc+proto),HttpProtocol(HTTP/1.1)))
 ```
diff --git a/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPlugin.groovy b/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPlugin.groovy
index 687ff4b10..07d3101aa 100644
--- a/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPlugin.groovy
+++ b/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPlugin.groovy
@@ -21,7 +21,7 @@ class PekkoGrpcPlugin implements Plugin<Project> {
 
     Project project
 
-    // workaround for test projects, when one only neesd to tests a new plugin version without rebuilding dependencies.
+    // workaround for test projects, when one only needs to tests a new plugin version without rebuilding dependencies.
     String getBaselineVersion(String pluginVersion) {
         def pv = System.getProperty("pekko.grpc.baseline.version", pluginVersion)
         if (VersionNumber.parse(pv).qualifier) {
diff --git a/interop-tests/src/main/java/io/grpc/testing/integration2/ClientTester.java b/interop-tests/src/main/java/io/grpc/testing/integration2/ClientTester.java
index 4e2a70d2f..9673fed80 100644
--- a/interop-tests/src/main/java/io/grpc/testing/integration2/ClientTester.java
+++ b/interop-tests/src/main/java/io/grpc/testing/integration2/ClientTester.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/java/io/grpc/testing/integration2/GrpcJavaClientTester.java b/interop-tests/src/main/java/io/grpc/testing/integration2/GrpcJavaClientTester.java
index 012fd91ce..f88d339c4 100644
--- a/interop-tests/src/main/java/io/grpc/testing/integration2/GrpcJavaClientTester.java
+++ b/interop-tests/src/main/java/io/grpc/testing/integration2/GrpcJavaClientTester.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcClientJava.java b/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcClientJava.java
index d98b945d5..816d6ac78 100644
--- a/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcClientJava.java
+++ b/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcClientJava.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcServerJava.java b/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcServerJava.java
index 5d55e06bc..795dfe22c 100644
--- a/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcServerJava.java
+++ b/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcServerJava.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/io/grpc/testing/integration2/ChannelBuilder.scala b/interop-tests/src/main/scala/io/grpc/testing/integration2/ChannelBuilder.scala
index 7a6a46b9c..95f0cfa1e 100644
--- a/interop-tests/src/main/scala/io/grpc/testing/integration2/ChannelBuilder.scala
+++ b/interop-tests/src/main/scala/io/grpc/testing/integration2/ChannelBuilder.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala b/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala
index 18864dfc9..dca3f4797 100644
--- a/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala
+++ b/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcClient.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcClient.scala
index 9c6e8454e..c0e3af204 100644
--- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcClient.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcClient.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcInteropTests.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcInteropTests.scala
index 68c631c9e..b1e4dd629 100644
--- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcInteropTests.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcInteropTests.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcServer.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcServer.scala
index c0f393651..809d87e76 100644
--- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcServer.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcServer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcClient.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcClient.scala
index 9e324bb46..89d335811 100644
--- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcClient.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcClient.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcServer.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcServer.scala
index 521d8e7cf..e2d5e5f75 100644
--- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcServer.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcServer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcClientScala.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcClientScala.scala
index 10e545f35..b7dde754e 100644
--- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcClientScala.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcClientScala.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcServerScala.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcServerScala.scala
index 4593963ac..8896e1ec5 100644
--- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcServerScala.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcServerScala.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java b/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java
index 538575afe..b2f75369e 100644
--- a/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java
+++ b/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorImpl.java b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorImpl.java
index 87d98f862..a5324dd9c 100644
--- a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorImpl.java
+++ b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorImpl.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java
index 6c2ada2cf..db859ba87 100644
--- a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java
+++ b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java
index 1741ac5f4..a5ef34b61 100644
--- a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java
+++ b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/java/org/apache/pekko/grpc/interop/JavaTestServiceImpl.java b/interop-tests/src/test/java/org/apache/pekko/grpc/interop/JavaTestServiceImpl.java
index 1815b50b0..efa13fb9b 100644
--- a/interop-tests/src/test/java/org/apache/pekko/grpc/interop/JavaTestServiceImpl.java
+++ b/interop-tests/src/test/java/org/apache/pekko/grpc/interop/JavaTestServiceImpl.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/java/org/apache/pekko/grpc/interop/PekkoGrpcJavaClientTester.java b/interop-tests/src/test/java/org/apache/pekko/grpc/interop/PekkoGrpcJavaClientTester.java
index 244cd234f..f27b98043 100644
--- a/interop-tests/src/test/java/org/apache/pekko/grpc/interop/PekkoGrpcJavaClientTester.java
+++ b/interop-tests/src/test/java/org/apache/pekko/grpc/interop/PekkoGrpcJavaClientTester.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/GrpcInteropSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/GrpcInteropSpec.scala
index 488760cdf..c056fba80 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/GrpcInteropSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/GrpcInteropSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoGrpcScalaClientTester.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoGrpcScalaClientTester.scala
index dc64c4ae8..fb7d23aca 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoGrpcScalaClientTester.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoGrpcScalaClientTester.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala
index 7a05fd48c..af3b32219 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/TestServiceImpl.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/TestServiceImpl.scala
index 4be73bd1e..dd48cd9dc 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/TestServiceImpl.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/TestServiceImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala
index 694c44b32..0901c6983 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/CountingGreeterServiceImpl.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/CountingGreeterServiceImpl.scala
index b3356457c..9c016ca7e 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/CountingGreeterServiceImpl.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/CountingGreeterServiceImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcChannelSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcChannelSpec.scala
index 6765463f4..a7d81465c 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcChannelSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcChannelSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
index 76228adc4..3741768a5 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshallingSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshallingSpec.scala
index 9bbbe92cf..c32ac83f6 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshallingSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshallingSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/LoadBalancingIntegrationSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/LoadBalancingIntegrationSpec.scala
index a7dda5cc3..408a56f84 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/LoadBalancingIntegrationSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/LoadBalancingIntegrationSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala
index cfe734357..6eedbee5d 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
@@ -98,7 +98,7 @@ class NonBalancingIntegrationSpec(backend: String)
 
       if (this.isInstanceOf[NonBalancingIntegrationSpecNetty] && service1.greetings.get != numberOfRequests) {
         system.log.warning(
-          s"Found only ${service1.greetings.get} requests rather than $numberOfRequests, likely a flakey test")
+          s"Found only ${service1.greetings.get} requests rather than $numberOfRequests, likely a flaky test")
         pending
       } else
         service1.greetings.get should be(numberOfRequests)
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerApiSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerApiSpec.scala
index 9fb4bfcc5..9a38b1bf8 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerApiSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerApiSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerGreeterServiceImpl.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerGreeterServiceImpl.scala
index 327e8bf4d..a555d9171 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerGreeterServiceImpl.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerGreeterServiceImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/RichErrorModelSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/RichErrorModelSpec.scala
index 74bdd683d..4013ab7a9 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/RichErrorModelSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/RichErrorModelSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/TelemetrySpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/TelemetrySpec.scala
index 21c8e4a0b..b784e698c 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/TelemetrySpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/TelemetrySpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/tools/MutableServiceDiscovery.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/tools/MutableServiceDiscovery.scala
index 702ab9152..1f088de6c 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/tools/MutableServiceDiscovery.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/tools/MutableServiceDiscovery.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala
index 3e32b1f8b..c9ff2a1b3 100644
--- a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala
+++ b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
@@ -42,7 +42,7 @@ object AbstractGenerateMojo {
         Right(unknown)
     }
 
-  private def captureStdOutAnderr[T](block: => T): (String, String, T) = {
+  private def captureStdOutAndErr[T](block: => T): (String, String, T) = {
     val errBao = new ByteArrayOutputStream()
     val errPrinter = new PrintStream(errBao, true, "UTF-8")
     val outBao = new ByteArrayOutputStream()
@@ -265,7 +265,7 @@ abstract class AbstractGenerateMojo @Inject() (buildContext: BuildContext) exten
       getLog.debug("protoc options: %s".format(protocOptions.mkString(",")))
 
       getLog.info("Compiling protobuf")
-      val (out, err, exitCode) = captureStdOutAnderr {
+      val (out, err, exitCode) = captureStdOutAndErr {
         executeProtoc(protocCommand, schemas, protoDir, protocOptions, generatedTargets)
       }
       if (exitCode != 0) {
diff --git a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/GenerateMojo.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/GenerateMojo.scala
index 32838a04b..50d4d8218 100644
--- a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/GenerateMojo.scala
+++ b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/GenerateMojo.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/ProtocBridgeCodeGenerator.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/ProtocBridgeCodeGenerator.scala
index 827f378fe..2312c6ed7 100644
--- a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/ProtocBridgeCodeGenerator.scala
+++ b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/ProtocBridgeCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/TestGenerateMojo.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/TestGenerateMojo.scala
index d50db2864..def4848cb 100644
--- a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/TestGenerateMojo.scala
+++ b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/TestGenerateMojo.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/maven-plugin/src/test/scala/org/apache/pekko/grpc/maven/ProtocSpec.scala b/maven-plugin/src/test/scala/org/apache/pekko/grpc/maven/ProtocSpec.scala
index accbb8398..0eaabc705 100644
--- a/maven-plugin/src/test/scala/org/apache/pekko/grpc/maven/ProtocSpec.scala
+++ b/maven-plugin/src/test/scala/org/apache/pekko/grpc/maven/ProtocSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/build.gradle b/plugin-tester-java/build.gradle
index 1fd506fe5..4a03edb54 100644
--- a/plugin-tester-java/build.gradle
+++ b/plugin-tester-java/build.gradle
@@ -13,7 +13,6 @@ pekkoGrpc {
 
 repositories {
   mavenLocal()
-  maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } // TODO Remove when proper release of pekko-http-cors is made
 }
 
 def scalaFullVersion = "2.12.18"
@@ -21,9 +20,9 @@ def scalaVersion = org.gradle.util.VersionNumber.parse(scalaFullVersion)
 def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"
 
 dependencies {
-  implementation group: 'ch.megard', name: "pekko-http-cors_${scalaBinaryVersion}", version: '0.0.0-SNAPSHOT'
+  implementation group: 'org.apache.pekko', name: "pekko-http-cors_${scalaBinaryVersion}", version: '0.0.0+4468-963bd592-SNAPSHOT'
   implementation "org.scala-lang:scala-library:${scalaFullVersion}"
-  testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:0.0.0+26669-ec5b6764-SNAPSHOT"
+  testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.0"
   testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.2.15"
   testImplementation "org.scalatestplus:junit-4-13_${scalaBinaryVersion}:3.2.15.0"
 }
diff --git a/plugin-tester-java/pom.xml b/plugin-tester-java/pom.xml
index 2fbc9e4a1..0f5969d45 100644
--- a/plugin-tester-java/pom.xml
+++ b/plugin-tester-java/pom.xml
@@ -15,7 +15,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
     <maven-exec-plugin.version>3.0.0</maven-exec-plugin.version>
-    <pekko.http.cors.version>0.0.0-SNAPSHOT</pekko.http.cors.version>
+    <pekko.http.version>0.0.0+4468-963bd592-SNAPSHOT</pekko.http.version>
     <grpc.version>1.48.1</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
     <project.encoding>UTF-8</project.encoding>
   </properties>
@@ -26,12 +26,6 @@
       <name>Apache Snapshots Repository</name>
       <url>https://repository.apache.org/content/repositories/snapshots/</url>
     </repository>
-    <!-- TODO Remove when proper release of pekko-http-cors is made -->
-    <repository>
-      <id>sonatype-snapshots</id>
-      <name>Sonatype Snapshots Repository</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-    </repository>
   </repositories>
 
   <dependencies>
@@ -41,9 +35,9 @@
       <version>${pekko.grpc.project.version}</version>
     </dependency>
     <dependency>
-      <groupId>ch.megard</groupId>
+      <groupId>org.apache.pekko</groupId>
       <artifactId>pekko-http-cors_2.12</artifactId>
-      <version>${pekko.http.cors.version}</version>
+      <version>${pekko.http.version}</version>
     </dependency>
 
     <!-- Needed for the generated client -->
diff --git a/plugin-tester-java/src/main/java/example/myapp/CombinedServer.java b/plugin-tester-java/src/main/java/example/myapp/CombinedServer.java
index 6463c7a06..04b38df07 100644
--- a/plugin-tester-java/src/main/java/example/myapp/CombinedServer.java
+++ b/plugin-tester-java/src/main/java/example/myapp/CombinedServer.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/echo/EchoServiceImpl.java b/plugin-tester-java/src/main/java/example/myapp/echo/EchoServiceImpl.java
index 21dcc7f1c..4e82da2c1 100644
--- a/plugin-tester-java/src/main/java/example/myapp/echo/EchoServiceImpl.java
+++ b/plugin-tester-java/src/main/java/example/myapp/echo/EchoServiceImpl.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/AuthenticatedGreeterServer.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/AuthenticatedGreeterServer.java
index b92d3503a..11fbdbaaf 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/AuthenticatedGreeterServer.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/AuthenticatedGreeterServer.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterClient.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterClient.java
index 9f19ce558..b82d3acde 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterClient.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterClient.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServer.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServer.java
index 666653f2a..bfe3bcfbb 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServer.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServer.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServiceImpl.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServiceImpl.java
index f49e2c8c7..002c3fb07 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServiceImpl.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServiceImpl.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServicePowerApiImpl.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServicePowerApiImpl.java
index be19e8502..be6792e59 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServicePowerApiImpl.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServicePowerApiImpl.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/LiftedGreeterClient.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/LiftedGreeterClient.java
index 7a554dffd..f599e0ba0 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/LiftedGreeterClient.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/LiftedGreeterClient.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.java
index 8c0d9b5c8..5f975f078 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/PowerGreeterServer.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/PowerGreeterServer.java
index 10d2d32d1..ebd8c51b8 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/PowerGreeterServer.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/PowerGreeterServer.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterActor.java b/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterActor.java
index 8aa82c5ab..11274b29a 100644
--- a/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterActor.java
+++ b/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterActor.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterServiceImpl.java b/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterServiceImpl.java
index a8f50f869..c941910d3 100644
--- a/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterServiceImpl.java
+++ b/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterServiceImpl.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala b/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
index 553b3276d..83fc07b84 100644
--- a/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
+++ b/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/test/scala/example/myapp/helloworld/JGreeterServiceSpec.scala b/plugin-tester-java/src/test/scala/example/myapp/helloworld/JGreeterServiceSpec.scala
index 3fb9496aa..087fc7891 100644
--- a/plugin-tester-java/src/test/scala/example/myapp/helloworld/JGreeterServiceSpec.scala
+++ b/plugin-tester-java/src/test/scala/example/myapp/helloworld/JGreeterServiceSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/build.gradle b/plugin-tester-scala/build.gradle
index f39836c06..397be7156 100644
--- a/plugin-tester-scala/build.gradle
+++ b/plugin-tester-scala/build.gradle
@@ -8,7 +8,6 @@ pekkoGrpc {
 
 repositories {
   mavenLocal()
-  maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } // TODO Remove when proper release of pekko-http-cors is made
 }
 
 def scalaFullVersion = "2.12.18"
@@ -16,10 +15,9 @@ def scalaVersion = org.gradle.util.VersionNumber.parse(scalaFullVersion)
 def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"
 
 dependencies {
-  implementation group: 'ch.megard', name: "pekko-http-cors_${scalaBinaryVersion}", version: '0.0.0-SNAPSHOT'
+  implementation group: 'org.apache.pekko', name: "pekko-http-cors_${scalaBinaryVersion}", version: '0.0.0+4468-963bd592-SNAPSHOT'
   implementation "org.scala-lang:scala-library:${scalaFullVersion}"
-  testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:0.0.0+26669-ec5b6764-SNAPSHOT"
+  testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.0"
   testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.2.15"
   testImplementation "org.scalatestplus:junit-4-13_${scalaBinaryVersion}:3.2.15.0"
 }
-
diff --git a/plugin-tester-scala/pom.xml b/plugin-tester-scala/pom.xml
index 2440316a1..22f377c4c 100644
--- a/plugin-tester-scala/pom.xml
+++ b/plugin-tester-scala/pom.xml
@@ -13,8 +13,8 @@
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <pekko.version>0.0.0+26669-ec5b6764-SNAPSHOT</pekko.version>
-    <pekko.http.cors.version>0.0.0-SNAPSHOT</pekko.http.cors.version>
+    <pekko.version>1.0.0</pekko.version>
+    <pekko.http.version>0.0.0+4468-963bd592-SNAPSHOT</pekko.http.version>
     <grpc.version>1.48.1</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
     <project.encoding>UTF-8</project.encoding>
   </properties>
@@ -25,12 +25,6 @@
       <name>Apache Snapshots Repository</name>
       <url>https://repository.apache.org/content/repositories/snapshots/</url>
     </repository>
-    <!-- TODO Remove when proper release of pekko-http-cors is made -->
-    <repository>
-      <id>sonatype-snapshots</id>
-      <name>Sonatype Snapshots Repository</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-    </repository>
   </repositories>
 
   <dependencies>
@@ -40,9 +34,9 @@
       <version>${pekko.grpc.project.version}</version>
     </dependency>
     <dependency>
-      <groupId>ch.megard</groupId>
+      <groupId>org.apache.pekko</groupId>
       <artifactId>pekko-http-cors_2.12</artifactId>
-      <version>${pekko.http.cors.version}</version>
+      <version>${pekko.http.version}</version>
     </dependency>
 
     <dependency>
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/CombinedServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/CombinedServer.scala
index 339449d8c..e17d02f04 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/CombinedServer.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/CombinedServer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/echo/EchoServiceImpl.scala b/plugin-tester-scala/src/main/scala/example/myapp/echo/EchoServiceImpl.scala
index fd9e6701b..5ea85446b 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/echo/EchoServiceImpl.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/echo/EchoServiceImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterClient.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterClient.scala
index 77331d260..5156238f4 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterClient.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterClient.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterServer.scala
index d76436810..4d022d906 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterServer.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterServer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterClient.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterClient.scala
index 28a2e30ff..38f2321f8 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterClient.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterClient.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServer.scala
index bbf2e8bc6..ebf272987 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServer.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServiceImpl.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServiceImpl.scala
index 010a63cf5..b80de2feb 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServiceImpl.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServiceImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LiftedGreeterClient.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LiftedGreeterClient.scala
index 401e08ab3..70bc15e48 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LiftedGreeterClient.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LiftedGreeterClient.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterClient.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterClient.scala
index 4a549a8b9..18b2a6e3e 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterClient.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterClient.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.scala
index 3769f916e..d99a7fc2b 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServer.scala
index 339305d42..bf093c787 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServer.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServiceImpl.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServiceImpl.scala
index d3cf9e931..3c33c2370 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServiceImpl.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServiceImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterActor.scala b/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterActor.scala
index 07a8660b5..5ce53fed3 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterActor.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterActor.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterServiceImpl.scala b/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterServiceImpl.scala
index e29304ead..21d16d03a 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterServiceImpl.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterServiceImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
index 7d4bdc639..ae43a08d8 100644
--- a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
+++ b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala
index 0b642d279..3cdc4af4d 100644
--- a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala
+++ b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/project/Assemblies.scala b/project/Assemblies.scala
index 12d881ba8..ab57bdab1 100644
--- a/project/Assemblies.scala
+++ b/project/Assemblies.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 import java.io.{ File, FileInputStream, FileOutputStream }
diff --git a/project/AutomaticModuleName.scala b/project/AutomaticModuleName.scala
index 77c266caf..19caf808f 100644
--- a/project/AutomaticModuleName.scala
+++ b/project/AutomaticModuleName.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /**
diff --git a/project/Common.scala b/project/Common.scala
index 780413fad..844090120 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 package org.apache.pekko.grpc
diff --git a/project/CopyrightHeader.scala b/project/CopyrightHeader.scala
index d17b58c26..7bcb1378b 100644
--- a/project/CopyrightHeader.scala
+++ b/project/CopyrightHeader.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
@@ -37,13 +37,30 @@ object CopyrightHeader extends AutoPlugin {
           (headerCreate / unmanagedResourceDirectories) += baseDirectory.value / "src" / "main" / "twirl"))
     })
 
-  val apacheHeader: String =
+  val apacheFromAkkaSourceHeader: String =
     """Licensed to the Apache Software Foundation (ASF) under one or more
       |license agreements; and to You under the Apache License, version 2.0:
       |
       |  https://www.apache.org/licenses/LICENSE-2.0
       |
-      |This file is part of the Apache Pekko project, derived from Akka.
+      |This file is part of the Apache Pekko project, which was derived from Akka.
+      |""".stripMargin
+
+  val apacheHeader: String =
+    """Licensed to the Apache Software Foundation (ASF) under one or more
+      |contributor license agreements. See the NOTICE file distributed with
+      |this work for additional information regarding copyright ownership.
+      |The ASF licenses this file to You under the Apache License, Version 2.0
+      |(the "License"); you may not use this file except in compliance with
+      |the License. You may obtain a copy of the License at
+      |
+      |   http://www.apache.org/licenses/LICENSE-2.0
+      |
+      |Unless required by applicable law or agreed to in writing, software
+      |distributed under the License is distributed on an "AS IS" BASIS,
+      |WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      |See the License for the specific language governing permissions and
+      |limitations under the License.
       |""".stripMargin
 
   val apacheSpdxHeader: String = "SPDX-License-Identifier: Apache-2.0"
@@ -55,7 +72,8 @@ object CopyrightHeader extends AutoPlugin {
         case Some(currentText) if isApacheCopyrighted(currentText) || isGenerated(currentText) =>
           currentText
         case Some(currentText) if isOnlyLightbendCopyrightAnnotated(currentText) =>
-          HeaderCommentStyle.twirlStyleBlockComment.commentCreator(text, existingText) + NewLine * 2 + currentText
+          HeaderCommentStyle.twirlStyleBlockComment.commentCreator(apacheFromAkkaSourceHeader,
+            existingText) + NewLine * 2 + currentText
         case Some(currentText) =>
           throw new IllegalStateException(s"Unable to detect copyright for header: [$currentText]")
         case None =>
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index adf82a36c..4b1135170 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 package org.apache.pekko.grpc
@@ -26,9 +26,9 @@ object Dependencies {
     // We don't force Pekko updates because downstream projects can upgrade
     // themselves. For more information see
     // https://pekko.apache.org//docs/pekko/current/project/downstream-upgrade-strategy.html
-    val pekko = "0.0.0+26669-ec5b6764-SNAPSHOT"
+    val pekko = "1.0.0"
     val pekkoBinary = "current"
-    val pekkoHttp = "0.0.0+4411-6fe04045-SNAPSHOT"
+    val pekkoHttp = "0.0.0+4468-963bd592-SNAPSHOT"
     val pekkoHttpBinary = "current"
 
     val grpc = "1.48.1" // checked synced by VersionSyncCheckPlugin
@@ -46,11 +46,10 @@ object Dependencies {
     val pekkoStream = "org.apache.pekko" %% "pekko-stream" % Versions.pekko
     val pekkoHttp = "org.apache.pekko" %% "pekko-http" % Versions.pekkoHttp
     val pekkoHttpCore = "org.apache.pekko" %% "pekko-http-core" % Versions.pekkoHttp
+    val pekkoHttpCors = "org.apache.pekko" %% "pekko-http-cors" % Versions.pekkoHttp
     val pekkoDiscovery = "org.apache.pekko" %% "pekko-discovery" % Versions.pekko
     val pekkoSlf4j = "org.apache.pekko" %% "pekko-slf4j" % Versions.pekko
 
-    val pekkoHttpCors = "ch.megard" %% "pekko-http-cors" % "0.0.0-SNAPSHOT" // Apache v2
-
     val scalapbCompilerPlugin = "com.thesamet.scalapb" %% "compilerplugin" % scalapb.compiler.Version.scalapbVersion
     val scalapbRuntime = ("com.thesamet.scalapb" %% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion)
       .exclude("io.grpc", "grpc-netty")
@@ -115,9 +114,7 @@ object Dependencies {
     Compile.pekkoHttpCore,
     Compile.pekkoHttp,
     Compile.pekkoDiscovery,
-    // TODO Remove exclusion rule when proper release of pekko-http-cors is made
-    (Compile.pekkoHttpCors % "provided").excludeAll(
-      "org.apache.pekko" %% "pekko-http"),
+    Compile.pekkoHttpCors,
     Compile.pekkoHttp % "provided",
     Test.pekkoTestkit,
     Test.pekkoStreamTestkit,
@@ -151,9 +148,7 @@ object Dependencies {
   val pluginTester = l ++= Seq(
     // usually automatically added by `suggestedDependencies`, which doesn't work with ReflectiveCodeGen
     Compile.grpcStub,
-    // TODO Remove exclusion rule when proper release of pekko-http-cors is made
-    Compile.pekkoHttpCors.excludeAll(
-      "org.apache.pekko" %% "pekko-http"),
+    Compile.pekkoHttpCors,
     Compile.pekkoHttp,
     Test.scalaTest,
     Test.scalaTestPlusJunit,
diff --git a/project/MetaInfLicenseNoticeCopy.scala b/project/MetaInfLicenseNoticeCopy.scala
index 36d856da5..f3b19be4c 100644
--- a/project/MetaInfLicenseNoticeCopy.scala
+++ b/project/MetaInfLicenseNoticeCopy.scala
@@ -1,10 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * license agreements; and to You under the Apache License, version 2.0:
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
  *
- *   https://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, which was derived from Akka.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import sbt.Keys._
diff --git a/project/NoPublish.scala b/project/NoPublish.scala
index db3a554dd..22b301abc 100644
--- a/project/NoPublish.scala
+++ b/project/NoPublish.scala
@@ -1,10 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * license agreements; and to You under the Apache License, version 2.0:
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
  *
- *   https://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.apache.pekko.grpc
diff --git a/project/ProjectExtensions.scala b/project/ProjectExtensions.scala
index 83ea6aecc..4b702c551 100644
--- a/project/ProjectExtensions.scala
+++ b/project/ProjectExtensions.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 package org.apache.pekko.grpc
diff --git a/project/ReflectiveCodeGen.scala b/project/ReflectiveCodeGen.scala
index eabf4ffb5..b6bb22cdc 100644
--- a/project/ReflectiveCodeGen.scala
+++ b/project/ReflectiveCodeGen.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 package org.apache.pekko.grpc.build
diff --git a/project/SbtMavenPlugin.scala b/project/SbtMavenPlugin.scala
index 27379589c..36214f445 100644
--- a/project/SbtMavenPlugin.scala
+++ b/project/SbtMavenPlugin.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 package org.apache.pekko.grpc
diff --git a/project/VersionGenerator.scala b/project/VersionGenerator.scala
index 524084cc7..b06e56923 100644
--- a/project/VersionGenerator.scala
+++ b/project/VersionGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 import sbt.Keys._
@@ -13,7 +13,7 @@ import sbt._
 /**
  * Generate version.conf file based on the version setting.
  *
- * This was adapted from https://github.com/akka/akka/blob/v2.6.8/project/VersionGenerator.scala
+ * This was adapted from https://github.com/apache/incubator-pekko/blob/main/project/VersionGenerator.scala
  */
 object VersionGenerator {
 
diff --git a/project/VersionSyncCheckPlugin.scala b/project/VersionSyncCheckPlugin.scala
index 444438808..4c5c0fa46 100644
--- a/project/VersionSyncCheckPlugin.scala
+++ b/project/VersionSyncCheckPlugin.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 package org.apache.pekko.grpc
diff --git a/project/build.properties b/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 28fe81d2f..ce78b2bfb 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,3 +1,12 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * license agreements; and to You under the Apache License, version 2.0:
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * This file is part of the Apache Pekko project, derived from Akka.
+ */
+
 enablePlugins(BuildInfoPlugin)
 
 val sbtProtocV = "1.0.6"
@@ -6,7 +15,7 @@ buildInfoKeys := Seq[BuildInfoKey]("sbtProtocVersion" -> sbtProtocV)
 
 addSbtPlugin("lt.dvim.authors" % "sbt-authors" % "1.3")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
-addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0")
+addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0")
 addSbtPlugin("com.thesamet" % "sbt-protoc" % sbtProtocV)
 addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1")
@@ -17,17 +26,18 @@ addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.30")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
 addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.10")
-addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.5")
+addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.8")
 
 // allow access to snapshots for pekko-sbt-paradox
 resolvers += Resolver.ApacheMavenSnapshotsRepo
+updateOptions := updateOptions.value.withLatestSnapshots(false)
 
 // See https://github.com/akka/akka-http/pull/3995 and https://github.com/akka/akka-http/pull/3995#issuecomment-1026978593
 libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % "always"
 
 // We have to deliberately use older versions of sbt-paradox because current Pekko sbt build
 // only loads on JDK 1.8 so we need to bring in older versions of parboiled which support JDK 1.8
-addSbtPlugin(("org.apache.pekko" % "pekko-sbt-paradox" % "0.0.0+37-3df33944-SNAPSHOT").excludeAll(
+addSbtPlugin(("org.apache.pekko" % "pekko-sbt-paradox" % "0.0.0+56-bff08336-SNAPSHOT").excludeAll(
   "com.lightbend.paradox", "sbt-paradox",
   "com.lightbend.paradox" % "sbt-paradox-apidoc",
   "com.lightbend.paradox" % "sbt-paradox-project-info"))
diff --git a/project/project-info.conf b/project/project-info.conf
index 07c20b69d..e3b754e0c 100644
--- a/project/project-info.conf
+++ b/project/project-info.conf
@@ -3,7 +3,7 @@ project-info {
   shared-info {
     jdk-versions: ["OpenJDK 8", "OpenJDK 11", "OpenJDK 17"]
     snapshots: {
-      url: "https://repository.apache.org/content/groups/snapshots/org/apache/pekko/grpc/"
+      url: "https://repository.apache.org/content/groups/snapshots/org/apache/pekko/"
       text: "Snapshots are available from Apache Snapshots Repository"
     }
     issues: {
diff --git a/runtime/src/main/java/org/apache/pekko/grpc/PekkoGrpcGenerated.java b/runtime/src/main/java/org/apache/pekko/grpc/PekkoGrpcGenerated.java
index 375b7b822..da1a272b2 100644
--- a/runtime/src/main/java/org/apache/pekko/grpc/PekkoGrpcGenerated.java
+++ b/runtime/src/main/java/org/apache/pekko/grpc/PekkoGrpcGenerated.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcChannel.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcChannel.scala
index f78b0c102..f9b94f2c2 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcChannel.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcChannel.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientCloseException.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientCloseException.scala
index 62482b0b0..e665b1934 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientCloseException.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientCloseException.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientResponse.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientResponse.scala
index b762d8616..f603d9b4a 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientResponse.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientResponse.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientSettings.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientSettings.scala
index 87f3adb96..1ef050147 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientSettings.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientSettings.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcProtocol.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcProtocol.scala
index 9c63b8102..1d8e2f042 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcProtocol.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcProtocol.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcServiceException.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcServiceException.scala
index 2b1903e70..f0440a2b9 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcServiceException.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcServiceException.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/ProtobufSerializer.scala b/runtime/src/main/scala/org/apache/pekko/grpc/ProtobufSerializer.scala
index d836ef450..64538749f 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/ProtobufSerializer.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/ProtobufSerializer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/SSLContextUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/SSLContextUtils.scala
index 13e93e8a8..78961019f 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/SSLContextUtils.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/SSLContextUtils.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/ServiceDescription.scala b/runtime/src/main/scala/org/apache/pekko/grpc/ServiceDescription.scala
index 179fc4912..0105d22cc 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/ServiceDescription.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/ServiceDescription.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/Trailers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/Trailers.scala
index a28b544ea..2c757e684 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/Trailers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/Trailers.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/AbstractGrpcProtocol.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/AbstractGrpcProtocol.scala
index 994720708..d1d6379d2 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/AbstractGrpcProtocol.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/AbstractGrpcProtocol.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ByteStringUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ByteStringUtils.scala
index 49cd4bb21..40e835b00 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ByteStringUtils.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ByteStringUtils.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/CancellationBarrierGraphStage.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/CancellationBarrierGraphStage.scala
index 0f6cb125e..a6cc72821 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/CancellationBarrierGraphStage.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/CancellationBarrierGraphStage.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ChannelUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ChannelUtils.scala
index 5fbd99286..f823e9a1e 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ChannelUtils.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ChannelUtils.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ClientState.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ClientState.scala
index fddd4a3ca..75b3632e0 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ClientState.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ClientState.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codec.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codec.scala
index 3e4aaf6bc..24b31a8f8 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codec.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codecs.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codecs.scala
index 3c7822981..4d369184a 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codecs.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codecs.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/DecodeBase64.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/DecodeBase64.scala
index f704d4e34..1ecdf3ada 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/DecodeBase64.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/DecodeBase64.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcEntityHelpers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcEntityHelpers.scala
index 7f7e8c6b8..75a7da03d 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcEntityHelpers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcEntityHelpers.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala
index a5ca903dd..b5c34865e 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolWeb.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolWeb.scala
index 62125743c..9519e1d56 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolWeb.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolWeb.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcRequestHelpers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcRequestHelpers.scala
index 184597f9d..0fc12b44c 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcRequestHelpers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcRequestHelpers.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcResponseHelpers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcResponseHelpers.scala
index 04717ceec..bb41a680d 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcResponseHelpers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcResponseHelpers.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Gzip.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Gzip.scala
index 8f9da9326..ce9aea0c6 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Gzip.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Gzip.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/HardcodedServiceDiscovery.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/HardcodedServiceDiscovery.scala
index 36156d1c0..4054faa6d 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/HardcodedServiceDiscovery.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/HardcodedServiceDiscovery.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Identity.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Identity.scala
index 8552611cf..281f5b6be 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Identity.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Identity.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/InternalChannel.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/InternalChannel.scala
index 99c1c907b..5c22c5f41 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/InternalChannel.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/InternalChannel.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Marshallers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Marshallers.scala
index 6ea8e58e6..dcc0bd04a 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Marshallers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Marshallers.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/MetadataImpl.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/MetadataImpl.scala
index 61a7a84be..bccee659a 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/MetadataImpl.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/MetadataImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/MissingParameterException.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/MissingParameterException.scala
index 767bd889c..87dc1b00a 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/MissingParameterException.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/MissingParameterException.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala
index bebf8eebb..7d27799a9 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolver.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolver.scala
index 5fa978620..e8821305c 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolver.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolver.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProvider.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProvider.scala
index c5257a788..66b5735ad 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProvider.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProvider.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala
index 840f51567..01215c2b1 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoNettyGrpcClientGraphStage.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoNettyGrpcClientGraphStage.scala
index bdde0b5b5..e129b5b35 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoNettyGrpcClientGraphStage.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoNettyGrpcClientGraphStage.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/RequestBuilderImpl.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/RequestBuilderImpl.scala
index d2def1094..0d51615f0 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/RequestBuilderImpl.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/RequestBuilderImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServerReflectionImpl.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServerReflectionImpl.scala
index f56eee2ed..c5a311316 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServerReflectionImpl.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServerReflectionImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServiceDescriptionImpl.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServiceDescriptionImpl.scala
index 4f6f8ffcb..63a6a32d1 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServiceDescriptionImpl.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServiceDescriptionImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/SingleParameterSink.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/SingleParameterSink.scala
index 6b3de6017..3123c2239 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/SingleParameterSink.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/SingleParameterSink.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala
index d35ade431..67d5fa150 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/UnaryCallAdapter.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/UnaryCallAdapter.scala
index 018fd1472..1a491ccb8 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/UnaryCallAdapter.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/UnaryCallAdapter.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/WithProtobufSerializer.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/WithProtobufSerializer.scala
index b58479109..43966e113 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/WithProtobufSerializer.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/WithProtobufSerializer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializer.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializer.scala
index 795299e14..054f5aa14 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializer.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcExceptionHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcExceptionHandler.scala
index 65aeb1674..76ec34c30 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcExceptionHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcExceptionHandler.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcMarshalling.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcMarshalling.scala
index 8fc5868d2..9711ac304 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcMarshalling.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcMarshalling.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/Metadata.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/Metadata.scala
index e69212056..4dc69c83f 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/Metadata.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/Metadata.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataBuilder.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataBuilder.scala
index 7adaf9a6c..5148d9459 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataBuilder.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataBuilder.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataEntry.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataEntry.scala
index bd281c85f..e504f3910 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataEntry.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataEntry.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/PekkoGrpcClient.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/PekkoGrpcClient.scala
index 695f1b69d..ad6e64a03 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/PekkoGrpcClient.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/PekkoGrpcClient.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/RequestBuilder.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/RequestBuilder.scala
index 06567e5c9..860fb227e 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/RequestBuilder.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/RequestBuilder.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServerReflection.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServerReflection.scala
index 9004849cd..d81d3521d 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServerReflection.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServerReflection.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServiceHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServiceHandler.scala
index 6ed3c39b6..a01303daf 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServiceHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServiceHandler.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala
index ea178fa63..ee2e14e18 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
@@ -21,6 +21,8 @@ import pekko.NotUsed
 import pekko.actor.ClassicActorSystemProvider
 import pekko.annotation.ApiMayChange
 import pekko.grpc.javadsl.ServiceHandler.{ concatOrNotFound, unsupportedMediaType }
+import pekko.http.cors.javadsl.settings.CorsSettings
+import pekko.http.cors.javadsl.CorsDirectives
 import pekko.http.javadsl.marshalling.Marshaller
 import pekko.http.javadsl.model.{ HttpRequest, HttpResponse }
 import pekko.http.javadsl.server.Route
@@ -32,8 +34,6 @@ import pekko.japi.function.{ Function => JFunction }
 import pekko.stream.Materializer
 import pekko.stream.javadsl.{ Keep, Sink, Source }
 import pekko.util.ConstantFun
-import ch.megard.pekko.http.cors.javadsl.settings.CorsSettings
-import ch.megard.pekko.http.cors.javadsl.CorsDirectives
 
 @ApiMayChange
 object WebHandler {
@@ -42,9 +42,9 @@ object WebHandler {
    * Creates a `HttpRequest` to `HttpResponse` handler for gRPC services that can be used in
    * for example `Http().bindAndHandleAsync` for the generated partial function handlers:
    *  - The generated handler supports the `application/grpc-web` and `application/grpc-web-text` media types.
-   *  - CORS is implemented for handled servives, including pre-flight requests and request enforcement.
+   *  - CORS is implemented for handled services, including pre-flight requests and request enforcement.
    *  - If the request s not a CORS pre-flight request, and has an invalid media type, then a _415: Unsupported Media Type_ response is produced.
-   *  - Otherise if the request is not handled by one of the provided handlers, a _404: Not Found_ response is produced.
+   *  - Otherwise if the request is not handled by one of the provided handlers, a _404: Not Found_ response is produced.
    */
   def grpcWebHandler(
       handlers: util.List[JFunction[HttpRequest, CompletionStage[HttpResponse]]],
@@ -66,9 +66,9 @@ object WebHandler {
    * Creates a `HttpRequest` to `HttpResponse` handler for gRPC services that can be used in
    * for example `Http().bind` for the generated partial function handlers:
    *  - The generated handler supports the `application/grpc-web` and `application/grpc-web-text` media types.
-   *  - CORS is implemented for handled servives, including pre-flight requests and request enforcement.
+   *  - CORS is implemented for handled services, including pre-flight requests and request enforcement.
    *  - If the request s not a CORS pre-flight request, and has an invalid media type, then a _415: Unsupported Media Type_ response is produced.
-   *  - Otherise if the request is not handled by one of the provided handlers, a _404: Not Found_ response is produced.
+   *  - Otherwise if the request is not handled by one of the provided handlers, a _404: Not Found_ response is produced.
    */
   def grpcWebHandler(
       handlers: util.List[JFunction[HttpRequest, CompletionStage[HttpResponse]]],
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/package.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/package.scala
index dd53f4246..4c3b4aa18 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/package.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/package.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala
index 05bb1e7fa..827a2b75e 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
@@ -13,17 +13,16 @@
 
 package org.apache.pekko.grpc.scaladsl
 
+import java.util.concurrent.ConcurrentHashMap
 import scala.concurrent.{ ExecutionContext, Future }
-import scala.jdk.CollectionConverters._
 
 import org.apache.pekko
 import pekko.Done
 import pekko.actor.{ CoordinatedShutdown, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider }
 import pekko.annotation.InternalApi
-import java.util.concurrent.ConcurrentHashMap
-
 import pekko.event.{ LogSource, Logging }
 import pekko.grpc.GrpcChannel
+import pekko.util.ccompat.JavaConverters._
 
 /** INTERNAL API */
 @InternalApi
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandler.scala
index bb4076643..157e21ee9 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandler.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshalling.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshalling.scala
index ec5ff3d25..e99285e30 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshalling.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshalling.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Metadata.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Metadata.scala
index 743e02e13..d8ce6056c 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Metadata.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Metadata.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilder.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilder.scala
index 7b5b76f99..1a20fc8a8 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilder.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilder.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataEntry.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataEntry.scala
index f85aa719a..14d937f1b 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataEntry.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataEntry.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/PekkoGrpcClient.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/PekkoGrpcClient.scala
index e86709c60..2d1f530a2 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/PekkoGrpcClient.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/PekkoGrpcClient.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/RequestBuilder.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/RequestBuilder.scala
index 2002e7fef..89e09f5a5 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/RequestBuilder.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/RequestBuilder.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializer.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializer.scala
index 3f6c2d211..1e997c662 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializer.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServerReflection.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServerReflection.scala
index 9752f69ec..3510f29fe 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServerReflection.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServerReflection.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServiceHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServiceHandler.scala
index 7d1aba5c8..c816321a3 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServiceHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServiceHandler.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala
index 0beb80d06..933a02409 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
@@ -15,23 +15,24 @@ package org.apache.pekko.grpc.scaladsl
 
 import scala.collection.immutable
 import scala.concurrent.Future
+import com.typesafe.config.ConfigFactory
 import org.apache.pekko
-import pekko.actor.ClassicActorSystemProvider
+import pekko.actor.{ ActorSystem, ClassicActorSystemProvider }
 import pekko.annotation.ApiMayChange
+import pekko.http.cors.scaladsl.CorsDirectives.cors
+import pekko.http.cors.scaladsl.model.HttpHeaderRange
+import pekko.http.cors.scaladsl.settings.CorsSettings
 import pekko.http.javadsl.{ model => jmodel }
 import pekko.http.scaladsl.model.{ HttpMethods, HttpRequest, HttpResponse }
 import pekko.http.scaladsl.model.headers._
 import pekko.http.scaladsl.server.Route
 import pekko.http.scaladsl.server.directives.MarshallingDirectives.handleWith
-import ch.megard.pekko.http.cors.scaladsl.CorsDirectives.cors
-import ch.megard.pekko.http.cors.scaladsl.model.HttpHeaderRange
-import ch.megard.pekko.http.cors.scaladsl.settings.CorsSettings
 
 @ApiMayChange
 object WebHandler {
 
   /** Default CORS settings to use for grpc-web */
-  val defaultCorsSettings: CorsSettings = CorsSettings.defaultSettings
+  val defaultCorsSettings: CorsSettings = CorsSettings(ConfigFactory.load())
     .withAllowCredentials(true)
     .withAllowedMethods(immutable.Seq(HttpMethods.POST, HttpMethods.OPTIONS))
     .withExposedHeaders(immutable.Seq(headers.`Status`.name, headers.`Status-Message`.name, `Content-Encoding`.name))
@@ -53,14 +54,14 @@ object WebHandler {
    * Creates a `HttpRequest` to `HttpResponse` handler for gRPC services that can be used in
    * for example `Http().bindAndHandleAsync` for the generated partial function handlers:
    *  - The generated handler supports the `application/grpc-web` and `application/grpc-web-text` media types.
-   *  - CORS is implemented for handled servives, including pre-flight requests and request enforcement.
+   *  - CORS is implemented for handled services, including pre-flight requests and request enforcement.
    *  - If the request is for a handled service, is not a CORS pre-flight request, and has an invalid media type, then a _415: Unsupported Media Type_ response is produced.
-   *  - Otherise if the request is not handled by one of the provided handlers, a _404: Not Found_ response is produced.
+   *  - Otherwise if the request is not handled by one of the provided handlers, a _404: Not Found_ response is produced.
    */
   def grpcWebHandler(handlers: PartialFunction[HttpRequest, Future[HttpResponse]]*)(
       implicit as: ClassicActorSystemProvider,
       corsSettings: CorsSettings = defaultCorsSettings): HttpRequest => Future[HttpResponse] = {
-    implicit val system = as.classicSystem
+    implicit val system: ActorSystem = as.classicSystem
     val servicesHandler = ServiceHandler.concat(handlers: _*)
     Route.toFunction(cors(corsSettings) {
       handleWith(servicesHandler)
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/headers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/headers.scala
index e903d0da3..86c097411 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/headers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/headers.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java b/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java
index c6729af37..376dcd21b 100644
--- a/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java
+++ b/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/java/org/apache/pekko/grpc/javadsl/ConcatOrNotFoundTest.java b/runtime/src/test/java/org/apache/pekko/grpc/javadsl/ConcatOrNotFoundTest.java
index e1b1885db..6f24a8346 100644
--- a/runtime/src/test/java/org/apache/pekko/grpc/javadsl/ConcatOrNotFoundTest.java
+++ b/runtime/src/test/java/org/apache/pekko/grpc/javadsl/ConcatOrNotFoundTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala b/runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala
index 7135d3dda..ce91806f6 100644
--- a/runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala
+++ b/runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/CodecsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/CodecsSpec.scala
index e2281d004..c57559134 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/CodecsSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/CodecsSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala
index 0a0801773..22f87a7b6 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/AlwaysTimingOutDiscovery.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/AlwaysTimingOutDiscovery.scala
index 0fab1b1ae..c2975219b 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/AlwaysTimingOutDiscovery.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/AlwaysTimingOutDiscovery.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/ChannelUtilsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/ChannelUtilsSpec.scala
index 271bcd19a..649107fad 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/ChannelUtilsSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/ChannelUtilsSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/DecodeBase64Spec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/DecodeBase64Spec.scala
index c6ea585d4..59118383d 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/DecodeBase64Spec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/DecodeBase64Spec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/GrpcProtocolWebTextSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/GrpcProtocolWebTextSpec.scala
index d050a8d87..1c326b6e0 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/GrpcProtocolWebTextSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/GrpcProtocolWebTextSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/MetadataImplSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/MetadataImplSpec.scala
index be933c36f..7aa38a2ec 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/MetadataImplSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/MetadataImplSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/NameResolverListenerProbe.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/NameResolverListenerProbe.scala
index b95df78e8..cd4079e66 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/NameResolverListenerProbe.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/NameResolverListenerProbe.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/NettyClientUtilsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/NettyClientUtilsSpec.scala
index c6fe2a276..55101a9b2 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/NettyClientUtilsSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/NettyClientUtilsSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProviderSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProviderSpec.scala
index 63417fbf8..ba19adbd0 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProviderSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProviderSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
@@ -46,7 +46,7 @@ class PekkoDiscoveryNameResolverProviderSpec
     with Matchers
     with ScalaFutures {
 
-  implicit override val patienceConfig =
+  implicit override val patienceConfig: PatienceConfig =
     PatienceConfig(timeout = scaled(Span(2, Seconds)), interval = scaled(Span(5, Millis)))
 
   "PekkoDiscoveryNameResolverProviderSpec" should {
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverSpec.scala
index dffed6562..d1c1f04b3 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtilsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtilsSpec.scala
index 9bcc37680..389b9d82f 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtilsSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtilsSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/ServerReflectionImplSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/ServerReflectionImplSpec.scala
index 699a57194..d1f70434f 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/ServerReflectionImplSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/ServerReflectionImplSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializerSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializerSpec.scala
index 88d47e803..212c08248 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializerSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializerSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
index 83e5d335e..7da9d95e6 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilderSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilderSpec.scala
index 6e8b49746..b5aef8a60 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilderSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilderSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializerSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializerSpec.scala
index 5f73005d0..951503402 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializerSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializerSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala
index 4d7e51466..e5fe5e0cd 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/GeneratorBridge.scala b/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/GeneratorBridge.scala
index 80123347c..13da7e158 100644
--- a/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/GeneratorBridge.scala
+++ b/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/GeneratorBridge.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/PekkoGrpcPlugin.scala b/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/PekkoGrpcPlugin.scala
index 0a4738137..4a8eeb9b3 100644
--- a/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/PekkoGrpcPlugin.scala
+++ b/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/PekkoGrpcPlugin.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt
index 1a846a3bb..a50522b57 100644
--- a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt
@@ -2,6 +2,7 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
+// TODO remove these resolvers when we start using released Pekko jars
 resolvers += Resolver.ApacheMavenSnapshotsRepo
 
 enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt
index 676964373..b5dd1be93 100644
--- a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt
@@ -2,6 +2,7 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
+// TODO remove these resolvers when we start using released Pekko jars
 resolvers += Resolver.ApacheMavenSnapshotsRepo
 
 enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt
index 676964373..b5dd1be93 100644
--- a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt
@@ -2,6 +2,7 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
+// TODO remove these resolvers when we start using released Pekko jars
 resolvers += Resolver.ApacheMavenSnapshotsRepo
 
 enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt
index 1a846a3bb..a50522b57 100644
--- a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt
@@ -2,6 +2,7 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
+// TODO remove these resolvers when we start using released Pekko jars
 resolvers += Resolver.ApacheMavenSnapshotsRepo
 
 enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt
index 676964373..b5dd1be93 100644
--- a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt
@@ -2,6 +2,7 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
+// TODO remove these resolvers when we start using released Pekko jars
 resolvers += Resolver.ApacheMavenSnapshotsRepo
 
 enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
index 37b1e8302..0e7f477c0 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
@@ -2,6 +2,7 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
+// TODO remove these resolvers when we start using released Pekko jars
 resolvers += Resolver.ApacheMavenSnapshotsRepo
 
 organization := "org.apache.pekko"
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/test/scala/org/apache/pekko/grpc/GrpcInteropSpec.scala b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/test/scala/org/apache/pekko/grpc/GrpcInteropSpec.scala
index 8eac02df9..a1aaf8363 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/test/scala/org/apache/pekko/grpc/GrpcInteropSpec.scala
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/test/scala/org/apache/pekko/grpc/GrpcInteropSpec.scala
@@ -16,14 +16,14 @@ import scala.concurrent.ExecutionContext
 // Generated by our plugin
 import io.grpc.testing.integration.test.TestServiceHandler
 
-class GrpcInteropIoWithAkkaSpec extends GrpcInteropTests(IoGrpcJavaServerProvider, PekkoHttpClientProviderScala)
+class GrpcInteropIoWithPekkoSpec extends GrpcInteropTests(IoGrpcJavaServerProvider, PekkoHttpClientProviderScala)
 
 class GrpcInteropPekkoScalaWithIoSpec extends GrpcInteropTests(PekkoHttpServerProviderScala, IoGrpcJavaClientProvider)
-class GrpcInteropPekkoScalaWithAkkaSpec
+class GrpcInteropPekkoScalaWithPekkoSpec
     extends GrpcInteropTests(PekkoHttpServerProviderScala, PekkoHttpClientProviderScala)
 
 class GrpcInteropPekkoJavaWithIoSpec extends GrpcInteropTests(PekkoHttpServerProviderJava, IoGrpcJavaClientProvider)
-class GrpcInteropPekkoJavaWithAkkaSpec
+class GrpcInteropPekkoJavaWithPekkoSpec
     extends GrpcInteropTests(PekkoHttpServerProviderJava, PekkoHttpClientProviderScala)
 
 object PekkoHttpServerProviderScala extends PekkoHttpServerProvider {
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt
index dbec69f0a..649dbd04d 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt
@@ -2,7 +2,9 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
+// TODO remove these resolvers when we start using released Pekko jars
 resolvers += Resolver.ApacheMavenSnapshotsRepo
+resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
 
 scalacOptions += "-Xfatal-warnings"
 
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt
index 8f1460d64..dfa3d83f5 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt
@@ -2,6 +2,8 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
+// TODO remove these resolvers when we start using released Pekko jars
 resolvers += Resolver.ApacheMavenSnapshotsRepo
+resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
 
 enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt
index 5259b6a3d..791c36709 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt
@@ -2,7 +2,9 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
+// TODO remove these resolvers when we start using released Pekko jars
 resolvers += Resolver.ApacheMavenSnapshotsRepo
+resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
 
 enablePlugins(PekkoGrpcPlugin)
 
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt
index 8f1460d64..dfa3d83f5 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt
@@ -2,6 +2,8 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
+// TODO remove these resolvers when we start using released Pekko jars
 resolvers += Resolver.ApacheMavenSnapshotsRepo
+resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
 
 enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt
index 8f1460d64..dfa3d83f5 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt
@@ -2,6 +2,8 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
+// TODO remove these resolvers when we start using released Pekko jars
 resolvers += Resolver.ApacheMavenSnapshotsRepo
+resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
 
 enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt
index 01baaf2e5..4699996c2 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt
@@ -2,7 +2,9 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
+// TODO remove these resolvers when we start using released Pekko jars
 resolvers += Resolver.ApacheMavenSnapshotsRepo
+resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
 
 enablePlugins(ProtocJSPlugin) // enable it first to test possibility of getting overriden
 
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt
index c02bb22d6..9e022e5dc 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt
@@ -2,7 +2,9 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
+// TODO remove these resolvers when we start using released Pekko jars
 resolvers += Resolver.ApacheMavenSnapshotsRepo
+resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
 
 enablePlugins(PekkoGrpcPlugin)
 
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt
index 0b2892df3..6efd81111 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt
@@ -2,7 +2,9 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
+// TODO remove these resolvers when we start using released Pekko jars
 resolvers += Resolver.ApacheMavenSnapshotsRepo
+resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
 
 enablePlugins(PekkoGrpcPlugin)
 
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt
index eff58a72f..e8b4d7c11 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt
@@ -2,7 +2,9 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
+// TODO remove these resolvers when we start using released Pekko jars
 resolvers += Resolver.ApacheMavenSnapshotsRepo
+resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
 
 //#setup
 import scalapb.GeneratorOption._
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt
index 8f1460d64..dfa3d83f5 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt
@@ -2,6 +2,8 @@
 // https://github.com/akka/akka-grpc/pull/1279
 scalaVersion := "2.12.18"
 
+// TODO remove these resolvers when we start using released Pekko jars
 resolvers += Resolver.ApacheMavenSnapshotsRepo
+resolvers += "apache-staging".at("https://repository.apache.org/content/groups/staging/")
 
 enablePlugins(PekkoGrpcPlugin)
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt
index d9c5b4b7d..e74a91112 100644
--- a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt
+++ b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt
@@ -1,5 +1,6 @@
 scalaVersion := "3.3.0"
 
+// TODO remove these resolvers when we start using released Pekko jars
 resolvers += Resolver.ApacheMavenSnapshotsRepo
 
 scalacOptions += "-Xfatal-warnings"
diff --git a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/build.properties b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/build.properties
index 40b3b8e7b..875b706a8 100644
--- a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/build.properties
+++ b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/scalapb-protoc-plugin/src/main/scala/org/apache/pekko/grpc/scalapb/Main.scala b/scalapb-protoc-plugin/src/main/scala/org/apache/pekko/grpc/scalapb/Main.scala
index fabba65b9..fcbf6132b 100644
--- a/scalapb-protoc-plugin/src/main/scala/org/apache/pekko/grpc/scalapb/Main.scala
+++ b/scalapb-protoc-plugin/src/main/scala/org/apache/pekko/grpc/scalapb/Main.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/scripts/link-validator.conf b/scripts/link-validator.conf
index e3c1bc525..f3cb659ad 100644
--- a/scripts/link-validator.conf
+++ b/scripts/link-validator.conf
@@ -22,6 +22,8 @@ site-link-validator {
     "https://github.com/apache/incubator-pekko-grpc/"
     # MVN repository forbids access after a few requests
     "https://mvnrepository.com/artifact/"
+    # we haven't yet set up the gradle plugin on plugins.gradle.org
+    "https://plugins.gradle.org/plugin/org.apache.pekko.grpc.gradle"
   ]
 
   non-https-whitelist = []