diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..8e3ff067f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,60 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: Bug
+assignees: ''
+
+---
+<!--
+Please fill out this template with all the information you have. The more info you can provide the easier it will be to help you out or fix the problem you are seeing. For trouble with the UI don’t forget to add a screenshot or two. Please do your best!
+
+Please note that this template is only for bugs. Please use other templates in case of feature requests or support requests
+
+Lastly, be sure to preview your issue before saving. Thanks!
+-->
+
+- [ ] I have searched open and closed issues for duplicates
+
+<!--
+  You can search all issues here
+  https://github.com/friendica/friendica/issues?utf8=%E2%9C%93&q=is%3Aissue
+  Replace [ ] with [X] once you've searched
+-->
+
+### Bug Description
+
+<!-- Give an overall summary of the issue. -->
+
+### Steps to Reproduce
+
+<!-- Using bullet points, list the steps that reproduce the bug. -->
+
+1.  step one
+2.  step two
+3.  step three
+
+Actual Result:
+
+<!-- Describe the details of the buggy behaviour. -->
+
+Expected Result:
+
+<!-- Describe in detail what the correct behavior should be. -->
+
+### Screenshots
+
+<!-- How to take screenshots on all OSes: https://www.take-a-screenshot.org/
+You can drag and drop images into this text box. -->
+
+### Platform Info
+
+Friendica Version:
+
+<!-- You can see Friendica’s version number at Help -> About this site -> Site/Friendica Version -->
+
+Friendica Source: 
+
+PHP version:
+
+SQL version:
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..7bdd4f066
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Friendica Community Support
+    url: https://forum.friendi.ca/
+    about: Please ask and answer questions here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..7484a8362
--- /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 000000000..86df43733
--- /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 e1ae36e70..000000000
--- 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