diff --git a/docs/src/main/paradox/introduction.md b/docs/src/main/paradox/introduction.md
index 5d8c306ef..45b069f84 100644
--- a/docs/src/main/paradox/introduction.md
+++ b/docs/src/main/paradox/introduction.md
@@ -48,20 +48,20 @@ You can bootstrap a new project with Apache Pekko HTTP already configured using
 @@@ div { .group-scala }
 For Scala (sbt)
 :  ```sh
-    sbt new theiterators/pekko-http-quickstart-scala.g8
+    sbt new apache/incubator-pekko-http-quickstart-scala.g8
     ```
 @@@
 @@@ div { .group-java }
 For Java (Maven or Gradle)
 :  ```sh
-    sbt new theiterators/pekko-http-quickstart-java.g8
+    sbt new apache/incubator-pekko-http-quickstart-java.g8
     ```
 From there on the prepared project can be built using Gradle or Maven.
 @@@
 
 More instructions can be found on the @scala[[template
-project](https://github.com/theiterators/pekko-http-quickstart-scala.g8)]@java[[template
-project](https://github.com/theiterators/pekko-http-quickstart-java.g8)].
+project](https://github.com/apache/incubator-pekko-http-quickstart-scala.g8)]@java[[template
+project](https://github.com/apache/incubator-pekko-http-quickstart-java.g8)].
 
 ## Routing DSL for HTTP servers
 
diff --git a/docs/src/main/paradox/routing-dsl/index.md b/docs/src/main/paradox/routing-dsl/index.md
index eed402344..3a545830a 100644
--- a/docs/src/main/paradox/routing-dsl/index.md
+++ b/docs/src/main/paradox/routing-dsl/index.md
@@ -55,7 +55,7 @@ the Routing DSL will look like:
 
 ## Getting started
 
-The project template in @scala[[Apache Pekko HTTP Quickstart for Scala](https://github.com/theiterators/pekko-http-quickstart-scala.g8)]@java[[Apache Pekko HTTP Quickstart for Java](https://github.com/theiterators/pekko-http-quickstart-java.g8)] will help you to get a working Apache Pekko HTTP server running.
+The project template in @scala[[Apache Pekko HTTP Quickstart for Scala](https://github.com/apache/incubator-pekko-http-quickstart-scala.g8)]@java[[Apache Pekko HTTP Quickstart for Java](https://github.com/apache/incubator-pekko-http-quickstart-java.g8)] will help you to get a working Apache Pekko HTTP server running.
 
 ## Compared with Play framework routes
 
diff --git a/http/src/main/java/org/apache/pekko/http/javadsl/server/HttpApp.java b/http/src/main/java/org/apache/pekko/http/javadsl/server/HttpApp.java
index 0f1af3271..21209cd38 100644
--- a/http/src/main/java/org/apache/pekko/http/javadsl/server/HttpApp.java
+++ b/http/src/main/java/org/apache/pekko/http/javadsl/server/HttpApp.java
@@ -30,7 +30,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
- * DEPRECATED, consider https://github.com/theiterators/pekko-http-quickstart-java.g8 instead
+ * DEPRECATED, consider https://github.com/apache/incubator-pekko-http-quickstart-java.g8 instead
  *
  * <p>Bootstrap trait for Http Server. It helps booting up a pekko-http server by only defining the
  * desired routes. It offers additional hooks to modify the default behavior.
diff --git a/http/src/main/scala/org/apache/pekko/http/scaladsl/server/HttpApp.scala b/http/src/main/scala/org/apache/pekko/http/scaladsl/server/HttpApp.scala
index a55895df8..974829b07 100644
--- a/http/src/main/scala/org/apache/pekko/http/scaladsl/server/HttpApp.scala
+++ b/http/src/main/scala/org/apache/pekko/http/scaladsl/server/HttpApp.scala
@@ -30,7 +30,7 @@ import scala.io.StdIn
 import scala.util.{ Failure, Success, Try }
 
 /**
- * DEPRECATED, consider https://github.com/theiterators/pekko-http-quickstart-scala.g8 instead
+ * DEPRECATED, consider https://github.com/apache/incubator-pekko-http-quickstart-scala.g8 instead
  *
  * Bootstrap trait for Http Server. It helps booting up a pekko-http server by only defining the desired routes.
  * It offers additional hooks to modify the default behavior.