diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
new file mode 100644
index 00000000000..0404afc2825
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+<!-- Please don't delete this template or we'll close your issue -->
+<!-- Before creating an issue please make sure you are using the latest version of webpack. -->
+
+# Bug report
+
+<!-- Please ask questions on StackOverflow or the webpack Gitter. -->
+<!-- https://stackoverflow.com/questions/ask?tags=webpack -->
+<!-- https://gitter.im/webpack/webpack -->
+<!-- Issues which contain questions or support requests will be closed. -->
+
+**What is the current behavior?**
+
+
+**If the current behavior is a bug, please provide the steps to reproduce.**
+
+
+<!-- A great way to do this is to provide your configuration via a GitHub repo. -->
+<!-- Best provide a minimal reproduceable repo with instructions -->
+<!-- Repos with too many files or long configs are not suitable -->
+<!-- Please only add small snippets of code directly into the issue -->
+<!-- https://gist.github.com is a good place for longer code snippets -->
+<!-- If your issue is caused by a plugin or loader file the issue on the plugin/loader repo instead. -->
+
+**What is the expected behavior?**
+
+
+<!-- "It should work" is not a good explaination -->
+<!-- Explain how exactly you expecting it to behave -->
+
+**Other relevant information:**
+webpack version:  
+Node.js version: 
+Operating System: 
+Additional tools:
diff --git a/.github/ISSUE_TEMPLATE/Custom.md b/.github/ISSUE_TEMPLATE/Custom.md
new file mode 100644
index 00000000000..5e5b62bd605
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Custom.md
@@ -0,0 +1,9 @@
+---
+name: Other
+about: Something else
+
+---
+
+<!-- Bug reports and Feature requests must use other templates, or will be closed -->
+<!-- Please ask questions on StackOverflow or the webpack Gitter (https://gitter.im/webpack/webpack). -->
+<!-- Issues which contain questions or support requests will be closed. -->
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
new file mode 100644
index 00000000000..e23f20d97cf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,27 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+<!-- Please don't delete this template or we'll close your issue -->
+
+## Feature request
+
+<!-- Issues which contain questions or support requests will be closed. -->
+<!-- Before creating an issue please make sure you are using the latest version of webpack. -->
+<!-- Check if this feature need to be implemented in a plugin or loader instead -->
+<!-- If yes: file the issue on the plugin/loader repo -->
+<!-- Features related to the development server should be filed on this repo instead -->
+
+**What is the expected behavior?**
+
+
+**What is motivation or use case for adding/changing the behavior?**
+
+
+**How should this be implemented in your opinion?**
+
+
+**Are you willing to work on this yourself?**
+yes