diff --git a/.github/issue_template.md b/.github/issue_template.md
new file mode 100644
index 000000000..717e67d0b
--- /dev/null
+++ b/.github/issue_template.md
@@ -0,0 +1,31 @@
+Thank you for submitting an issue.
+
+# Feature Request Info
+## Problem you are trying to solve
+Help us understand the problem you are facing. Please provide as much context as possible.
+
+## Proposed solution/feature
+What is the proposed solution and why do you think it is the best approach to the problem above.
+
+## Would you want to open an PR for this feature?
+
+# Bug Report Info
+## Currently:
+What is the current broken behavior?
+
+## Expected:
+What the correct behavior should be?
+
+## Steps to Reproduce:
+Please provide as much detail as possible. 
+
+## Deployment Context:
+Please provide relevant details about your deployment. That might include:
+* Are you using cf-mysql-release with a service broker?
+* How many nodes and proxies are deployed?
+* Other relevant deployment topology info
+* Release version
+* Other bosh releases deployed on the same vms
+
+## Reference:
+Attach screenshot(s) or logs if relevant
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000000000..1b4499929
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,11 @@
+Thanks for opening a PR. Please make sure you've read and followed the [Contributing guide](https://github.com/cloudfoundry-incubator/pxc-release/blob/master/README.md#contribution-guide), including signing the Contributor License Agreement.
+
+# Feature or Bug Description
+What does this PR change?  
+
+# Motivation
+Tell us about the problem you are facing, with context, that this PR solves.
+
+# Related Issue
+If this PR was first opened as an issue, please provide the link to that issue here.
+