diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 4da4667edb..959b6306f0 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -8,16 +8,14 @@ labels: bug
 <!-- choose one -->
 **Impact**: rtl | software | unknown | other
 
+**Tell us about your environment:**
+*Chipyard Version:* <!-- 1.2.0, Hash: 2c0928 -->
+*OS:* <!-- `Linux knight 4.4.0-92-generic #115-Ubuntu SMP Thu Aug 10 09:04:33 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux` -->
+*Other:* <!-- `prior steps taken/documentation followed/...` -->
+
 **What is the current behavior?**
 
 **What is the expected behavior?**
 
-**Please tell us about your environment:**
-<!--    (examples)
-    - version: `chipyard git commit hash`
-    - os: `Linux knight 4.4.0-92-generic #115-Ubuntu SMP Thu Aug 10 09:04:33 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux`
-    - other: `prior steps taken/documentation followed/...`
--->
-
 **Other information**
 <!-- include detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, ... -->
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index b8c3f48294..f1b4e218f9 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -5,6 +5,11 @@ labels: question
 
 ---
 
+<!--
+    this type of issue is more for "how-tos", understanding chipyard, etc.
+    if you find an error or issue with chipyard, please use the "Bug Report Issue".
+-->
+
 <!-- have you looked at the Chipyard documentation? -->
 <!-- have you looked at the subproject documentation/githubs? -->
 <!-- for example: -->