diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..86ccad97dc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,33 @@
+<!-- Thanks for filing an issue! Before submitting your issue, please answer the following questions.-->
+
+**Is this a bug report or feature request?** (choose one):
+
+<!--
+If this is a BUG REPORT, please:
+  - Fill in as much of the template as possible.  If you leave out
+    information, we may automatically close out your pull request.
+
+If this is a FEATURE REQUEST, please:
+  - Describe *in detail* the feature/behavior/change you'd like to see.
+
+Detailed responses allow our community to address your concerns in a timely manner.
+If we can't determine what you're asking for, we may close your issue.  If you feel
+we haven't adequately addressed your issue, please feel free to reopen your issue
+and explain your issue in more detail.
+-->
+
+**Kubernetes Version** (output of `kubectl version`):
+
+**Helm Client and Tiller Versions** (output of `helm version`):
+
+**Development or Deployment Environment?**:
+
+**Release Tag or Master**:
+
+**Expected Behavior**:
+
+**What Actually Happened**:
+
+**How to Reproduce the Issue** (as minimally as possible):
+
+**Any Additional Comments**:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..b1395ce0c5
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,14 @@
+<!--  
+      Thanks for contributing to OpenStack-Helm!  Please be thorough
+      when filling out your pull request. If the purpose for your pull
+      request is not clear, we may close your pull request and ask you
+      to resubmit.
+-->
+
+**What is the purpose of this pull request?**:
+
+**What issue does this pull request address?**: Fixes #
+
+**Notes for reviewers to consider**:
+
+**Specific reviewers for pull request**: