diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 45c83619e..b414d2927 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-labels: bug, needs triage
+labels: bug, potential-bug, needs triage
 
 ---
 
@@ -20,7 +20,7 @@ labels: bug, needs triage
 
 | Questions                 | Answers
 |---------------------------|--------------------
-| Type of issue             | Bug, Question, Feature Request, support...
+| Type of issue             | Bug
 | OS version (server)       | Debian, Ubuntu, CentOS, RedHat, ...
 | OS version (client)       | MacOS, Win10, Ubuntu, ...
 | PHP version               | 5.4, 5.5, 5.6, 7.0, 7.1...
diff --git a/.github/ISSUE_TEMPLATE/support_request.md b/.github/ISSUE_TEMPLATE/support_request.md
new file mode 100644
index 000000000..6fd8ded58
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/support_request.md
@@ -0,0 +1,34 @@
+---
+name: Support
+about: Support requests for MISP
+labels: support, needs triage
+
+---
+
+## Please consider the following notes
+- Critical security bugs can be reported, preferably PGP encrypted, by mail to: info@circl.lu
+- Bug reports and feature requests can be filed as an issue on github: https://github.com/MISP/MISP/issues
+- For interactive support please join the Gitter chat on: https://gitter.im/MISP/MISP
+
+The official documentation of MISP can be found here: https://www.circl.lu/doc/misp/
+We also periodically do user/admin/developer trainings and have our training material online: https://www.circl.lu/services/misp-training-materials/
+
+Nevertheless you can of course file a Support request as an issue. Please be as precise as possible and fill the template as detailed as possible too.
+Please remove this text until the line below. Thanks a lot.
+--------8<------
+
+### Work environment
+
+| Questions                 | Answers
+|---------------------------|--------------------
+| Type of issue             | Support
+| OS version (server)       | Debian, Ubuntu, CentOS, RedHat, ...
+| OS version (client)       | MacOS, Win10, Ubuntu, ...
+| PHP version               | 5.4, 5.5, 5.6, 7.0, 7.1... (if relevant)
+| MISP version / git hash   | 2.4.XX, hash of the commit
+| Browser                   | If applicable
+
+### Support Questions
+
+
+### Logs, screenshots, configuration dump, ...