diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/---bug-report.md
similarity index 55%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/---bug-report.md
index ce7f42d4cd..b102020770 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -1,9 +1,13 @@
-<!-- 
-We use the issue tracker for bugs and feature requests. For general questions and discussion please use https://discuss.akka.io or https://gitter.im/akka/akka instead.
+---
+name: "\U0001F41B Bug report"
+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 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
  - ...
 
diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/---feature-request.md
new file mode 100644
index 0000000000..ed9b3087d0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/---feature-request.md
@@ -0,0 +1,17 @@
+---
+name: "\U0001F389 Feature request"
+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
+ - ...
+
+Please explain your use case precisely, and if possible provide an example snippet.
+
+Thanks, happy hakking!
+-->
diff --git a/.github/ISSUE_TEMPLATE/--question.md b/.github/ISSUE_TEMPLATE/--question.md
new file mode 100644
index 0000000000..8799ed0859
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/--question.md
@@ -0,0 +1,7 @@
+---
+name: "❓ Question"
+about: Please use https://discuss.akka.io for questions
+
+---
+
+Please use https://discuss.akka.io for questions instead of posting them to the issue tracker.