diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..9da561e0ac
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: Bug
+assignees: ''
+
+---
+
+### Expected behavior
+
+<!-- Describe in detail what the correct behavior should be. -->
+
+### Actual behavior
+
+<!-- Describe the details of the buggy behaviour. -->
+
+### Steps to reproduce the problem
+
+<!-- Using bullet points, list the steps that reproduce the bug. -->
+
+1. step one
+2. step two
+3. step three
+
+### Platform Info
+
+Friendica Version: <!-- You can see Friendica’s version number at Help -> About this site -> Site/Friendica Version -->
+
+Friendica source (git, zip):
+
+PHP version: 
+
+SQL version:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..7484a8362a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,22 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: New Feature
+assignees: ''
+
+---
+
+### Is the feature request related to a problem? Please describe.
+
+<!-- A clear and concise description of what the problem is. Like `I'm always frustrated when [...]`
+
+### Describe the feature you'd like
+
+<!-- A clear and concise description of waht you want to happen. -->
+
+### Describe alternatives you've considered
+
+<!-- A clear and concise description of any alternative solutions or feature you've considered. -->
+
+### Additional context
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 0000000000..86df437339
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,10 @@
+---
+name: Question / Support
+about: Select this if you have a question 
+title: ''
+labels: Support Request
+assignees: ''
+
+---
+
+# For general question about Friendica, please try to find a solution at https://wiki.friendi.ca first.
\ No newline at end of file
diff --git a/.github/issue_template.md b/.github/issue_template.md
deleted file mode 100644
index e1ae36e709..0000000000
--- a/.github/issue_template.md
+++ /dev/null
@@ -1,15 +0,0 @@
-### Expected behavior
-
-### Actual behavior
-
-### Steps to reproduce the problem
-
-### Friendica version you encountered the problem
-
-see `example.com/friendica` on your Friendica node for the version information.
-
-### Friendica source (git, zip)
-
-### PHP version
-
-### SQL version