diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000000..19a05fc78d7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,12 @@
+Thank you! For helping us make Grafana even better.
+
+To help us respond to your issues faster, please make sure to add as much information as possible.
+
+If this issue is about a plugin, please open the issue in that repository.
+
+Tag your issues title with [Feature Request] / [Bug] / [Question] or no tag if your unsure.
+
+Ex
+* What grafana version are you using?
+* What datasource are you using?
+* What OS are you running grafana on?
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000000..e69de29bb2d