diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
index b102020770..16389076e5 100644
--- a/.github/ISSUE_TEMPLATE/---bug-report.md
+++ b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -6,12 +6,12 @@ about: Create a report to help us improve
 
 <!--
 Please report issues regarding specific projects in their respective issue trackers, e.g.:
- - Akka HTTP: https://github.com/akka/akka-http/issues
- - Alpakka:   https://github.com/akka/alpakka/issues
- - Akka Persistence Cassandra Plugin: https://github.com/akka/akka-persistence-cassandra/issues
+ - Pekko HTTP: https://github.com/apache/incubator-pekko-http/issues
+ - Pekko Connectors: https://github.com/apache/incubator-pekko-connectors/issues 
+ - Pekko Persistence Cassandra Plugin: https://github.com/apache/incubator-pekko-persistence-cassandra/issues
  - ...
 
 Please explain your issue precisely, and if possible provide a reproducer snippet (this helps resolve issues much quicker).
 
-Thanks, happy hakking!
+Thanks for contributing!
 -->
diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/---feature-request.md
index ed9b3087d0..a01668dc1b 100644
--- a/.github/ISSUE_TEMPLATE/---feature-request.md
+++ b/.github/ISSUE_TEMPLATE/---feature-request.md
@@ -6,12 +6,12 @@ about: Suggest an idea for this project
 
 <!--
 Please report issues regarding specific projects in their respective issue trackers, e.g.:
- - Akka HTTP: https://github.com/akka/akka-http/issues
- - Alpakka:   https://github.com/akka/alpakka/issues
- - Akka Persistence Cassandra Plugin: https://github.com/akka/akka-persistence-cassandra/issues
+ - Pekko HTTP: https://github.com/apache/incubator-pekko-http/issues
+ - Pekko Connectors: https://github.com/apache/incubator-pekko-connectors/issues 
+ - Pekko Persistence Cassandra Plugin: https://github.com/apache/incubator-pekko-persistence-cassandra/issues
  - ...
 
 Please explain your use case precisely, and if possible provide an example snippet.
 
-Thanks, happy hakking!
+Thanks for contributing!
 -->
diff --git a/.github/ISSUE_TEMPLATE/--question.md b/.github/ISSUE_TEMPLATE/--question.md
index 8799ed0859..0044d479b6 100644
--- a/.github/ISSUE_TEMPLATE/--question.md
+++ b/.github/ISSUE_TEMPLATE/--question.md
@@ -1,7 +1,7 @@
 ---
 name: "❓ Question"
-about: Please use https://discuss.akka.io for questions
+about: Please use https://github.com/apache/incubator-pekko/discussions for questions
 
 ---
 
-Please use https://discuss.akka.io for questions instead of posting them to the issue tracker.
+Please use https://github.com/apache/incubator-pekko/discussions for questions instead of posting them to the issue tracker.