diff --git a/.github/ISSUE_TEMPLATE/1-feature-request.md b/.github/ISSUE_TEMPLATE/1-feature-request.md
new file mode 100644
index 0000000..44226d6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1-feature-request.md
@@ -0,0 +1,26 @@
+---
+name: Feature Request
+about: Suggest an idea for this project
+labels: enhancement
+assignees: checktheroads
+---
+
+<!--
+If the answer to any of these questions is "no", your feature request will most likely be rejected (but will still be considered).
+- Is the new feature only applicable to one Network Operating System (https://hyperglass.io/docs/platforms)?
+- Would the new feature work only on mobile, or only on desktop?
+- Would the new feature only support IPv4, or IPv6?
+- Is the new feature something that can be reasonably customized by hyperglass end-users?
+-->
+
+# Feature Description
+<!-- Describe the solution or change you would like. -->
+
+### Is your feature request related to a problem? Please describe.
+<!-- If yes, a clear and concise description of what the problem is. -->
+
+# Environment & Use Case
+<!-- Describe your use case for hyperglass, the environment on which it runs, the predominant network device type, and any other relevant details. -->
+
+# Additional Context
+<!-- Add any other context or screenshots about the feature request here. -->
diff --git a/.github/ISSUE_TEMPLATE/2-bug-report.md b/.github/ISSUE_TEMPLATE/2-bug-report.md
new file mode 100644
index 0000000..e49015b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-bug-report.md
@@ -0,0 +1,51 @@
+---
+name: Bug Report
+about: Report a problem or unexpected behavior
+labels: bug
+assignees: checktheroads
+---
+
+<!-- Please provide a general summary of the issue in the Title. -->
+
+# Bug Description
+<!-- A clear and concise description of the bug. -->
+
+# Expected behavior
+<!-- A clear and concise description of what you expected to happen. -->
+
+# Steps to Reproduce
+<!-- Provide steps necessary to reproduce this issue. -->
+
+## Local Configurations
+<!-- If possible, please a link to a live example and the relevant sections of your hyperglass.yaml, commands.yaml, or devices.yaml in a code block. -->
+
+```
+<configs>
+```
+
+## Logs
+<!-- If an error occurred, please paste the relevant error message(s) in the below code block. -->
+
+```
+<logs>
+```
+
+# Possible Solution
+<!-- If you think you know what would fix this, please share your ideas. -->
+
+# Environment
+
+## Server
+ - OS: <!-- (e.g. Ubuntu 18.04, CentOS 7) -->
+ - Python Version: <!-- (e.g. 3.6) -->
+ - hyperglass Version: <!-- (e.g 1.0.0) -->
+
+## Client
+ - OS & Version: <!-- (e.g. Windows 10, macOS 10.15, Ubuntu Linux 18.04) -->
+ - Browser: <!-- (e.g. Chrome, Safari, Firefox, etc.) -->
+
+### Smartphone Details (if applicable)
+ - Device: <!-- (e.g. iPhone, Samsung) -->
+ - OS: <!-- (e.g. iOS 13.1, Android 11) -->
+ - Browser: <!-- (e.g. Safari, Chrome) -->
+ 
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
deleted file mode 100644
index d9182b5..0000000
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,3 +0,0 @@
-<-- 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: -->
-
-### Fixes:
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..748a1c7
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,15 @@
+<!-- PLEASE CONSULT CONTRIBUTING.MD PRIOR TO WORKING ON HYPERGLASS -->
+
+<!-- Provide a general summary of your changes in the Title. -->
+
+# Description
+<!-- Describe your changes in detail -->
+
+# Related Issues
+<!-- Link to any related open issues -->
+
+# Motivation and Context
+<!-- Why is this change required? What problem does it solve? -->
+
+# Tests
+<!-- Please describe in detail how you tested your changes, including your testing environment (OS, Python version, etc). -->