diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..875b047
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,37 @@
+---
+name: Bug report
+about: Report a behavioural problem with SteamVR
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+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.
+
+**System Information (please complete the following information):**
+- Distribution: [Arch/Manjaro/Ubuntu/etc.]
+- SteamVR version: [E.g. 1.7.2]
+- Steam client version: [build number or date] 
+- Opted into Steam client beta?: [Yes/No]
+- Graphics driver version:  [run `nvidia-settings` or `vulkaninfo | grep driverInfo`:
+- Gist for SteamVR System Information: [See [instructions](https://github.com/ValveSoftware/SteamVR-for-Linux/blob/master/CapturingSystemReport.md)]
+
+**Additional context**
+Add any other context about the problem here.
+
+**Note:** Commenters who are also experiencing this issue are encouraged to include the "System Information" section in their replies.
diff --git a/.github/ISSUE_TEMPLATE/performance-issue.md b/.github/ISSUE_TEMPLATE/performance-issue.md
index f9141e6..fabd61c 100644
--- a/.github/ISSUE_TEMPLATE/performance-issue.md
+++ b/.github/ISSUE_TEMPLATE/performance-issue.md
@@ -1,8 +1,8 @@
 ---
 name: Performance Issue
-about: Report a behavioural problem with SteamVR
-title: "[BUG]"
-labels: bug
+about: Report a performance problem with SteamVR
+title: "[PERF]"
+labels: perf
 assignees: ''
 
 ---
@@ -21,17 +21,21 @@ Steps to reproduce the behavior:
 A clear and concise description of what you expected to happen.
 
 **Screenshots**
-If applicable, add screenshots to help explain your problem.
+If applicable, add screenshots to help explain your problem. If possible, also include screenshot of vrmonitor's timing graph.
 
 **System Information (please complete the following information):**
 - Distribution: [Arch/Manjaro/Ubuntu/etc.]
-- SteamVR version?: [E.g. 1.7.2]
+- SteamVR version: [E.g. 1.7.2]
 - Steam client version: [build number or date] 
 - Opted into Steam client beta?: [Yes/No]
 - Graphics driver version:  [run `nvidia-settings` or `vulkaninfo | grep driverInfo`:
 - Gist for SteamVR System Information: [See [instructions](https://github.com/ValveSoftware/SteamVR-for-Linux/blob/master/CapturingSystemReport.md)]
 
+**Performance Data (optional, but very helpful):**
+- Gist for perf top: [See [instructions](https://github.com/ValveSoftware/SteamVR-for-Linux/blob/master/CapturingPerfData.md)]
+- Link to gpuvis trace: [See [instructions](https://github.com/ValveSoftware/SteamVR-for-Linux/blob/master/CapturingPerfData.md)]
+
 **Additional context**
 Add any other context about the problem here.
 
-**Note:** Commenters who are also experiencing this issue are encouraged to include the "System Information" section in their replies.
+**Note:** Commenters who are also experiencing this issue are encouraged to include the "System Information" and "Perf Data" sections in their replies.