diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index c17c43b..77456b1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,25 +7,33 @@ assignees: ''
 
 ---
 
-## Information
+<!--- Provide a general summary of the issue in the Title above -->
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+#### Expected behavior
+<!--- Tell us what should happen -->
 
-**To Reproduce**
-Steps to reproduce the behavior.
+#### Current Behavior
+<!--- Tell us what happens instead of the expected behavior -->
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+#### Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+#### Steps to Reproduce
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
 
-## Environment
+## Context (Environment)
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
 
 ### Back End
 **Server:**
  - OS: [e.g. Ubuntu, CentOS]
+ - Hyperglass Version: [e.g 1.0.0]
  - Python Version: 
  - Reverse Proxy: [e.g. NGINX, Caddy]
  - Redis Version: 
@@ -42,5 +50,8 @@ If applicable, add screenshots to help explain your problem.
  - Browser [e.g. stock browser, safari]
  - Version [e.g. 22]
 
-**Additional context**
-Add any other context about the problem here.
+## Screenshots
+<!--- If applicable, add screenshots to help explain -->
+
+## Possible Implementation
+<!--- Not obligatory, but suggest an idea for implementing addition or change -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..a49eab2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: true
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d9182b5..49ddca5 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,22 @@
-<-- Thank you for your interest in contributing to hyperglass. The contribution policy requires that a feature request or bug must be opened prior to a pull request being reviewed. Please list the related feature request or bug below: -->
+<!--- Provide a general summary of your changes in the Title above -->
 
-### Fixes:
+## Description
+<!--- Describe your changes in detail -->
+
+## Related Issue
+<!--- Thank you fro your interest in contributing to hyperglass -->
+<!--- This project only accepts pull requests related to open issues -->
+<!--- If suggesting a new feature or change, please discuss it in an issue first -->
+<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
+<!--- Please link to the issue here: -->
+
+## Motivation and Context
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+## Screenshots (if appropriate):