diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 6b0c6cac70..90e514958e 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,14 +1,16 @@
-## Overview
-- `Insomnia Version:` _(e.g. 5.0.2)_
-- `Operating System:`  _(e.g. MacOS 10.12.4 (16E195))_
-- `Summary: ` _(A few sentences describing the issue. Try to include as much detail as possible.)_
+<!--
+Be help prevent duplicates by searching existing issues first 🙂
 
-## How To Reproduce
-_Please list all pertinent information and steps needed to reproduce the issue. For example:_
-1. _Create new request_
-2. _Perform a request which returns a response with a link in it_
-3. _You can see the link query params aren't properly parsed_
+Here are a few helpful tips, depending on what type of issue you are creating:
 
-## Other Notes
+[Bug] – Provide a detailed description, as well as steps for anyone to reproduce the issue
+[Feature Request] – Provide concrete use cases to go along with these requests
+[Question] – Ask whatever you want!
+-->
 
-_(Any other information you feel is relevant to the issue including lines of code that may be causing it, potential solutions, opinions, etc.)_
+- Insomnia Version: ___
+- Operating System: ___
+
+## Details
+
+<!-- issue details here -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 00639f113e..fd42e4b048 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,17 +1,8 @@
-Please open an [Issue](https://github.com/getinsomnia/insomnia/issues/new) first to discuss new features or non-trivial changes. If an Issue already exists, please follow the template below when creating a Pull Request.
-____
+<!--
+Please open an [Issue](https://github.com/getinsomnia/insomnia/issues/new) first to discuss new 
+features or non-trivial changes. Please provide as much detail as possible on the change as
+possible including general description, implementation details, potential shortcommings, etc.
 
-## What
-_(A description or bullet point list of what changes have been included in this PR. Please attach screenshots if UI changes were made)_
-
-## Why
-_(A description or bullet point list of why the changes mentioned above have been included in this PR.)_
-
-## Details
-_(Any important detail regarding how functionality of Insomnia changes due to the code changes in included in this PR.)_
-
-## Notes
-_(Anything else you might want to mention regarding this PR, if any.)_
-
-**Related Issue**: _(Issue number this PR references, for example #4)_
+If this PR closes an issue, please mention "Closes #XX" where #XX is the issue number.
+-->