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/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 77456b1..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-<!--- Provide a general summary of the issue in the Title above -->
-
-#### Expected behavior
-<!--- Tell us what should happen -->
-
-#### Current Behavior
-<!--- Tell us what happens instead of the expected behavior -->
-
-#### Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-
-#### 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.
-
-## 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: 
-
-### Front End
-**Desktop:**
- - OS: [e.g. Windows, macOS, Linux]
- - Browser [e.g. Chrome, Safari, etc.]
- - Version [e.g. Windows 10, macOS 10.14, Ubuntu Linux 18.04]
-
-**Smartphone: (if applicable):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-## 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