4 files changed, 71 insertions, 0 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..ed5d56ce32
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report to help us improve the QMK Firmware
+---
+
+**Describe the bug**
+
+A clear and concise description of what the bug is.
+
+**System Information**
+ - Keyboard:  
+   - Revision (if applicable):  
+ - Operating System:
+ - avr-gcc version: 
+   (Run `avr-gcc --version` to find out)
+ - arm gcc version: 
+   (Run `arm-none-eabi-gcc --version` to find out)
+ - QMK Firmware version:
+   (you can run `git describe --abbrev=0 --tags` to find this out)
+ - Any keyboard related software installed? 
+   - [ ] Auto Hot Key
+   - [ ] Karabiner
+   - [ ] Other
+
+**Additional context**
+
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..ac924b3ac7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,15 @@
+---
+name: Feature request
+about: Suggest a new feature or changes to existing features 
+
+---
+
+## Feature Request Type
+
+- [ ] Core Functionality
+- [ ] Add-on hardware support (eg audio, rgb, oled screen, etc)
+- [ ] Alteration (enhancement/optimization) of existing Feature(s)
+- [ ] New behavior
+
+## Description 
+A few sentances describing what it is that you'd like to see. Additional information (such as links to spec sheets, licensing info, other related issues or PR's, etc) would be helpful. 
diff --git a/.github/ISSUE_TEMPLATE/other_issues.md b/.github/ISSUE_TEMPLATE/other_issues.md
new file mode 100644
index 0000000000..53481f9ab8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other_issues.md
@@ -0,0 +1,7 @@
+---
+name: Other issues
+about: Anything else that doesn't fall into the above categories. 
+
+---
+
+Please check https://docs.qmk.fm/SUPPORT.md for additional resources first. If that doesn't answer your question, check the bug report option, as that may be more appropriate. 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..36410da266
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,22 @@
+## Code Change Type
+- [ ] Core
+- [ ] Feature
+- [ ] Bugfix
+- [ ] Keyboard
+- [ ] Keymap/Layout/Userspace
+- [ ] Enhancement/Optimization
+- [ ] Documentation
+
+## Description
+A few sentences describing the overall goals of the pull request's commits.
+
+## Todo
+- [ ] Tests
+- [ ] Documentation
+
+## Issues Fixed or Closed by this PR
+
+* 
+
+## Long Description
+If needed, a longer description and a list of changes should be added here to make it clear what exactly this PR's goals are.