diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 476d8bb6..dde161d9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,37 +1,39 @@
 ---
-name: Bug report
+name: Issue report
 about: Create a report to help us improve
 
 ---
 
+<!---
 Hi! Thanks for using JupyterHub.
 
-If you are reporting an issue with JupyterHub, please use the [GitHub issue](https://github.com/jupyterhub/jupyterhub/issues) search feature to check if your issue has been asked already. If it has, please add your comments to the existing issue.
+If you are reporting an issue with JupyterHub, please use the GitHub search feature to check if your issue has been asked already. If it has, please add your comments to the existing issue.
+
+Some tips:
+- Running `jupyter troubleshoot` from the command line, if possible, and posting
+its output would also be helpful.
+- Running JupyterHub in `--debug` mode (`jupyterhub --debug`) can also be helpful for troubleshooting.
+--->
 
 **Describe the bug**
 A clear and concise description of what the bug is.
 
+<!---Add description here--->
+
 **To Reproduce**
-Steps to reproduce the behavior:
+<!---
+Please share the steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
+--->
 
 **Expected behavior**
+<!---
 A clear and concise description of what you expected to happen.
+--->
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
-
-- Running `jupyter troubleshoot` from the command line, if possible, and posting
-its output would also be helpful.
-- Running in `--debug` mode can also be helpful for troubleshooting.
+**Compute Information**
+ - Operating System
+ - JupyterHub Version [e.g. 22]
diff --git a/.github/ISSUE_TEMPLATE/installation-and-configuration-issues.md b/.github/ISSUE_TEMPLATE/installation-and-configuration-issues.md
index 9a6c731b..2505d1d8 100644
--- a/.github/ISSUE_TEMPLATE/installation-and-configuration-issues.md
+++ b/.github/ISSUE_TEMPLATE/installation-and-configuration-issues.md
@@ -1,7 +1,22 @@
 ---
-name: Installation and configuration issues
+name: Installation and configuration questions
 about: Installation and configuration assistance
 
 ---
 
-If you are having issues with installation or configuration, you may ask for help on the JupyterHub gitter channel or file an issue here.
+<!---
+If you are reading this message, you have probably already searched the existing
+GitHub issues for JupyterHub. If you haven't tried a search, we encourage you to do so.
+
+If you are unsure where to ask your question (Jupyter, JupyterHub, JupyterLab, etc.),
+please ask on our [Discourse Q&A channel](https://discourse.jupyter.org/c/questions).
+
+If you have a quick question about JupyterHub installation or configuratation, you
+may ask on the [JupyterHub gitter channel](https://gitter.im/jupyterhub/jupyterhub).
+
+:sunny: Please be patient. We are volunteers and will address your question when we are able. :sunny:
+
+If after trying the above steps, you still have an in-depth installation or
+configuration question, such as a possible bug, please file an issue below and include
+any relevant details.
+--->
diff --git a/.github/PULL_REQUEST_TEMPLATE/.keep b/.github/PULL_REQUEST_TEMPLATE/.keep
deleted file mode 100644
index e69de29b..00000000
diff --git a/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.md