diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..df4daa2e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,28 @@
+<!-- choose all that apply -->
+**Type of issue**: bug report | feature request | question | other enhancement
+
+<!-- if the issue is NOT a question, fill out the following sections -->
+
+<!-- choose one -->
+**Impact**: no rtl change | rtl refactoring | new rtl | unknown
+
+<!-- choose one -->
+**Development Phase**: request | proposal
+
+**Other information**
+<!-- include detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context -->
+
+<!-- if the current behavior is a bug, please provide the following steps to reproduce the problem -->
+
+**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/...`
+-->
+
+**What is the use case for changing the behavior?**
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..fe031ca1
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+**Related issue**: <!-- if applicable -->
+
+<!-- choose one -->
+**Type of change**: bug fix | new feature | other enhancement
+
+<!-- choose one -->
+**Impact**: no rtl change | rtl refactoring | new rtl | unknown
+
+<!-- choose one -->
+**Development Phase**: proposal |  implementation
+
+**Release Notes**
+<!-- Text from here to the end of the body will be considered for inclusion in the release notes for the version containing this pull request. -->