diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 97%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
index 92674e14e9..8e7c773beb 100644
--- a/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -86,25 +86,20 @@ Short and descriptive example bug report title
 
 ### Issue Summary
 
-A summary of the issue and the browser/OS environment in which it occurs. If
-suitable, include the steps required to reproduce the bug.
+A summary of the issue and the browser/OS environment in which it occurs. 
 
 ### Steps to Reproduce
 
 1. This is the first step
-2. This is the second step
-3. Further steps, etc.
+2. This is the second step, etc.
 
-Any other information you want to share that is relevant to the issue being
-reported. Especially, why do you consider this to be a bug? What do you expect to happen instead?
+Any other info e.g. Why do you consider this to be a bug? What did you expect to happen instead?
 
 ### Technical details:
 
 * Ghost Version: master (latest commit: a761de2079dca4df49567b1bddac492f25033985)
-* Client OS: Mac OS X 10.10.1
-* Server OS: CentOS 6.4
 * Node Version: 0.10.16
-* Browser: Chrome 39.0.2171.71
+* Browser: Chrome 48.0.2564.109 on Mac OS X 10.10.4
 * Database: SQLite / MySQL / postgres
 ```
 
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..4691e54e16
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,21 @@
+Welcome to Ghost's GitHub repo! 👋🎉
+
+Do you need help or have a question? Please come chat in Slack: https://ghost.org/slack 👫. Got an idea for a new feature? Please add it to our wishlist: http://ideas.ghost.org 🌟. Found a bug? Please fill out the sections below... thank you 👍
+
+### Issue Summary
+
+A summary of the issue and the browser/OS environment in which it occurs. 
+
+### Steps to Reproduce
+
+1. This is the first step
+2. This is the second step, etc.
+
+Any other info e.g. Why do you consider this to be a bug? What did you expect to happen instead?
+
+### Technical details:
+
+* Ghost Version:
+* Node Version:
+* Browser/OS: 
+* Database: 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..6d858b5ae2
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,8 @@
+Got some code for us? Awesome 🎊!
+
+Please include a description of your change & check your PR against this list, thanks!
+- [ ] Commit message has a short title & issue references
+- [ ] Commits are squashed 
+- [ ] The build will pass (run `npm test`).
+
+More info can be found by clicking the "guidelines for contributing" link above.