diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index d7f8526c..4f1db63d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,7 @@
 ---
 name: Bug report
-about: Open a bug report when you experience broken functionality within the latest version of the Maybe app
+about: Open a bug report when you experience broken functionality within the latest
+  version of the Maybe app
 title: 'Bug: [Add descriptive title here]'
 labels: ''
 assignees: ''
@@ -17,6 +18,7 @@ assignees: ''
 ### How are you using Maybe?
 
 - [ ] I am a paying Maybe customer (hosted version)
+  - Paying Maybe users can also open requests in Intercom (if there is sensitive info involved)
 - [ ] I am a self-hosted user
 
 ### Self hoster checklist
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
index 6a230e6e..9e0c9148 100644
--- a/.github/ISSUE_TEMPLATE/other.md
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -7,15 +7,36 @@ assignees: ''
 
 ---
 
-**PLEASE READ before opening an issue:**
+## Before you start (required)
 
-- Is this a feature request?  Please [open a feature request discussion](https://github.com/maybe-finance/maybe/discussions/new?category=feature-requests).
-- Do you need help or have a question?  Please [open a discussion](https://github.com/maybe-finance/maybe/discussions/new/choose) or [join our Discord](https://link.maybe.co/discord) and post to the "help" channel.
+### Is this a bug?
 
-----------------------
+A bug is _broken functionality_ of the app (i.e. it prevents you from using the app).  For bugs, please use the ["Bug Report" template](https://github.com/maybe-finance/maybe/issues) instead.
 
-**Is this issue related to a problem?  Please describe.**
+### Is this a bug with _sensitive info_?
 
-**Describe the work that needs to be done to address this issue**
+If you are a _paying_ Maybe user, you can open a support request in Intercom.
 
-**Additional context**
+### Is this a feature request?
+
+A feature request is functionality that you would like that is not already on our [Roadmap](https://github.com/maybe-finance/maybe/wiki/Roadmap).
+
+All feature requests should be opened as Discussions here:
+
+https://github.com/maybe-finance/maybe/discussions/categories/feature-requests
+
+Be sure to search existing discussions prior to opening a new feature request.
+
+### Is this related to Docker and/or hosting for self hosting?
+
+If you are having a Docker configuration issue, please do not open a Github issue unless you've identified a bug in our Dockerfile.  To get help with self hosting, there are several options:
+
+- **First**: Read our [self hosting guides](https://github.com/maybe-finance/maybe/tree/main/docs/hosting) and follow them step-by-step
+- Open a [General Discussion](https://github.com/maybe-finance/maybe/discussions/categories/general)
+- Make a post in the "Self hosted" channel in our [Discord](https://link.maybe.co/discord)
+
+---
+
+## Issue description
+
+If your issue does not fall into the categories above, please provide a **descriptive and complete** overview of your issue.