diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 75a20ea6c3..ed168d43e1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -6,11 +6,12 @@ labels: 'bug'
 assignees: ''
 
 ---
+This issue tracker is for bug reports only. **If you want to request troubleshooting assistance with Outline Manager or Outline Client, please do not submit a bug here. Instead, please contact us using our [support website](https://support.getoutline.org/s/contactsupport).** Developers, please post your questions on the [SDK Discussion board](https://github.com/Jigsaw-Code/outline-sdk/discussions).
 
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+**To reproduce**
 How can the broken behavior be reproduced? 
 
 **Expected behavior**
@@ -19,11 +20,11 @@ What behavior did you expect?
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Client System (please complete the following information):**
+**Client system (please complete the following information):**
  - Outline Client Version [e.g. iOS 1.3.1]
  - Your Operating System: [e.g. iOS 14.2, Windows 10]
 
-**Submit Feedback**
+**Submit feedback**
 Please submit feedback through the app and label it with this issue number.
 
 **Additional context**
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 1a538ee543..c844dc569b 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,10 +1,12 @@
 ---
 name: Question
-about: The issue tracker is not for questions. Please ask questions at support@getoutline.org.
+about: Questions about Outline
 title: ''
-labels: ''
+labels: 'question'
 assignees: ''
 
 ---
 
-The issue tracker is not for questions. Please ask questions at support@getoutline.org.
+The issue tracker is not for questions. 
+
+If you would like support with Outline Manager or Outline Client, please review the help articles on [support.getoutline.org](https://support.getoutline.org/), and [contact us](https://support.getoutline.org/s/contactsupport) if you need further assistance. Developers, please post your questions on the SDK [Discussion board](https://github.com/Jigsaw-Code/outline-sdk/discussions).
diff --git a/.github/ISSUE_TEMPLATE/support_request.md b/.github/ISSUE_TEMPLATE/support_request.md
new file mode 100644
index 0000000000..1d849a50fe
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/support_request.md
@@ -0,0 +1,11 @@
+---
+name: Support request
+about: Get help troubleshooting an issue
+title: ''
+labels: 'customer support'
+assignees: ''
+
+---
+The issue tracker is not for support requests. 
+
+If you would like support with Outline Manager or Outline Client, please review the help articles on [support.getoutline.org](https://support.getoutline.org/), and [contact us](https://support.getoutline.org/s/contactsupport) if you need further assistance. Developers, please post your questions on the SDK [Discussion board](https://github.com/Jigsaw-Code/outline-sdk/discussions).