diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 1754dcc7e..3d2d656c3 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,19 +1,22 @@
 ---
-name: Is this a bug in Notebook? Open an issue.
-about:
-  If you're not sure, feel free to post your question on Jupyter's Discourse
-  channel.
+name: "\U0001F41B Bug report"
+about: Create a report to help us repair something that is currently broken
+labels: bug, status:Needs Triage
+---
 
-labels: bug
----
+<!-- Welcome! Thank you for contributing. These HTML comments will not render in the issue, but you can delete them once you've read them if you prefer! -->
 
 <!--
-BEFORE YOU OPEN AN ISSUE, PLEASE READ THIS.
+Right now, you're opening an issue to report a bug in Jupyter Notebook.
 
-Hello! Thank you for using Jupyter Notebook. We're glad you're here.
+Please answer the following questions for yourself before submitting an issue
+- [ ] I checked the documentation and found no answer
+- [ ] I checked to make sure that this issue has not already been filed
+- [ ] I'm reporting the issue to the correct repository
 
-Right now, you're opening an issue. Before you do, let's make sure this is the right place to post your question/issue.
+If you have further questions after reading below, please visit the Jupyter Notebook discourse channel (https://discourse.jupyter.org/) and submit your questions there. There are many more people in the Jupyter community that engage on that channel.
 
+NOTE:
 Jupyter Notebook 6.x development is in maintenance-only mode. Bugs found in Notebook 6.x and that don't reproduce in Notebook 7.x may not get fixed.
 
 Work in this repository is focused on Jupyter Notebook 7.x, the former RetroLab project. The code base for Notebook 7.x is very different than Notebook 6.x. If you can, please try reproducing Notebook 6.x bugs with Notebook 7.x using the main branch of this repository.
@@ -21,36 +24,56 @@ Work in this repository is focused on Jupyter Notebook 7.x, the former RetroLab
 We recommend that you check out JupyterLab (https://github.com/jupyterlab/jupyterlab), Jupyter's next generation Notebook interface.
 
 Here, we're looking for specific bugs in the Jupyter Notebook codebase. If you think you've identified such a bug, you can continue opening your issue here. We'd appreciate if you include as much detail as possible, such as links to the offending code, snapshots of the UI issue, code blocks with your console logs, etc.
+-->
 
-If you're having issues installing Jupyter Notebook, or you're having another issue and don't know how to proceed, try the following:
+## Description
 
-1. scan the "What to do when things go wrong" (https://jupyter-notebook.readthedocs.io/en/stable/troubleshooting.html#what-to-do-when-things-go-wrong) page in our documentation to see if your question has already been answered
+<!--Describe the bug clearly and concisely. Include screenshots if possible-->
 
-2. post your question on the Jupyter Notebook discourse channel (https://discourse.jupyter.org/c/notebook/31). There are many more people in the Jupyter community that engage on that channel.
-   -->
+## Reproduce
 
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
+<!--Describe step-by-step instructions to reproduce the behavior-->
 
 1. Go to '...'
-1. Click on '....'
-1. Scroll down to '....'
-1. See error
+2. Click on '...'
+3. Scroll down to '...'
+4. See error '...'
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+<!--Describe how you diagnosed the issue. See the guidelines at
+https://jupyter-notebook.readthedocs.io/en/latest/troubleshooting -->
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+## Expected behavior
 
-**Desktop (please complete the following information):**
+<!--Describe what you expected to happen-->
 
-- OS: \[e.g. iOS\]
-- Browser \[e.g. chrome, safari\]
-- Version \[e.g. 22\]
+## Context
 
-**Additional context**
-Add any other context about the problem here.
+<!--Complete the following for context, and add any other relevant context-->
+
+- Operating System and version: <!-- e.g. Linux Ubuntu 21.04 -->
+- Browser and version: <!-- e.g. Chrome 92 -->
+<!-- Please note the Notebook version you are working with. You can find this in the Help -> About Jupyter Notebook menu option or by running `jupyter --version` from your terminal -->
+- Jupyter Notebook version: <!-- e.g. 3.1.7 -->
+
+<!--The more content you provide, the more we can help!-->
+
+<details><summary>Troubleshoot Output</summary>
+<pre>
+Paste the output from running `jupyter troubleshoot` from the command line here.
+You may want to sanitize the paths in the output.
+</pre>
+</details>
+
+<details><summary>Command Line Output</summary>
+<pre>
+Paste the output from your command line running `jupyter notebook` here, use `--debug` if possible.
+</pre>
+</details>
+
+<details><summary>Browser Output</summary>
+<!--See https://webmasters.stackexchange.com/a/77337 for how to access the JavaScript console-->
+<pre>
+Paste the output from your browser Javascript console here, if applicable.
+
+</pre>
+</details>
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 17b34444a..16e60c334 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,11 +1,14 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
   - name: Is this a common issue? See our Docs.
-    url: https://jupyter-notebook.readthedocs.io/en/stable/troubleshooting.html#what-to-do-when-things-go-wrong
+    url: https://jupyter-notebook.readthedocs.io/en/latest/troubleshooting.html#what-to-do-when-things-go-wrong
     about: Before opening an issue, make sure your issue hasn't already been addressed in the documentation.
-  - name: Do you need support or a question answered? See Jupyter Discourse.
+  - name: \U0001F914 Support and all other questions, including if you're not sure what to do.
     url: https://discourse.jupyter.org/c/notebook/31
-    about: If you have a question or you're having issues installing Jupyter Notebook, try posting on Discourse. There are lots of friendly Joyvans there to help!
-  - name: Do you have a feature request? See JupyterLab.
+    about: If you have a question or you're having issues installing Jupyter Notebook, try posting on Discourse.
+  - name: "\U0001F4AC Chat with the devs"
+    url: https://app.gitter.im/#/room/#jupyter_notebook:gitter.im
+    about: Ask short questions about using Jupyter Notebook
+  - name: 📝 Do you have a feature request that may be applied upstream? See JupyterLab.
     url: https://github.com/jupyterlab/jupyterlab
-    about: We won't likely accept new features for Jupyter Notebook 6.x. We recommend that you check out JupyterLab for new features and support.
+    about: We recommend that you cross-referrence JupyterLab for information when requesting new features and support for Notebook 7. We won't likely accept new features for Jupyter Notebook 6.x.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..4904f7223
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,41 @@
+---
+name: "\U0001F680 Feature Request"
+about: Suggest a new feature or a change
+labels: enhancement, status:Needs Triage
+---
+
+<!-- Welcome! These HTML comments will not render in the issue, but you can delete them once you've read them if you prefer! -->
+
+<!--
+Thanks for thinking of a way to improve Jupyter Notebook. If this solves a problem for you, then it probably solves that problem for lots of people! So the whole community will benefit from this request.
+
+NOTE: Please note that Jupyter Notebook 6.x development is in maintenance-only mode.
+
+Finally, please answer the following questions for yourself before submitting an issue.
+
+- [ ] I checked to make sure that this issue has not already been filed
+- [ ] I'm reporting the issue to the correct repository
+
+-->
+
+### Problem
+
+<!-- Provide a clear and concise description of what problem this feature will solve. For example:
+
+* I'm always frustrated when [...] because [...]
+* I would like it if [...] happened when I [...] because [...]
+-->
+
+### Proposed Solution
+
+<!-- Provide a clear and concise description of a way to accomplish what you want. For example:
+
+* Add an option so that when [...]  [...] will happen
+ -->
+
+### Additional context
+
+<!-- Add any other context or screenshots about the feature request here. You can also include links to examples of other programs that have something similar to your request. For example:
+
+* Another project [...] solved this by [...]
+-->