diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 34895527..00000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
-We, the rest of the NativeScript community, thank you for your
-feedback! 
-To help the rest of the community review your issue, please follow the instructions in the template.
--->
-
-<!-- ISSUE TEMPLATE -->
-<!-- (Update "[ ]" to "[x]" to check a box) -->
-
-## Issue Checklist
-
-- [ ] You are submitting: <!-- a feature request; a bug report. For questions, please use the [NativeScript Forum]. -->
-- [ ] You verified that this is a real problem by searching the [NativeScript Forum] and the other [issues] in this repo.
-- [ ] You checked our [demo apps] and the [documentation] for sample usage.
-
-## Tell us about the problem
-<!-- Describe the issue with a few words. Provide build log and steps to reproduce if relevant. -->
-
-## Local environment
-
-- [ ] Platform <!-- Linux, Mac, Windows -->
-- [ ] Node version XX <!-- run `node --version` -->
-- [ ] NativeScript CLI version <!-- run `tns --version` -->
-
-## Project data
-
-- [ ] Platform you are building the app for <!-- Android, iOS, Both -->
-- [ ] Node dependencies:
-```
-<!-- Provide the content of your package.json. -->
-```
-- [ ] Webpack configuration:
-```
-<!-- Provide the content of your webpack.config.js. -->
-```
-
-[NativeScript Forum]: http://forum.nativescript.org
-[issues]: https://github.com/nativescript/nativescript-dev-webpack/issues?utf8=✓&q=is%3Aissue
-[demo apps]: ../demo
-[documentation]: https://docs.nativescript.org/best-practices/bundling-with-webpack
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..63158228
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: 'We really appreciate your effort to provide feedback. Before opening a new
+  issue, please make sure that this case is not already reported in GitHub as an
+  issue or in StackOverflow as a question.'
+
+---
+
+**Environment**
+Provide version numbers for the following components (information can be retrieved by running `tns info` in your project folder or by inspecting the `package.json` of the project):
+ - CLI: 
+ - Cross-platform modules:
+ - Android Runtime:
+ - iOS Runtime:
+ - Plugin(s):
+ - Node.js:
+ 
+ - [ ] Please, attach your package.json and webpack.config.js as these configurations are usually critical for investigating issues with webpack
+ 
+
+**Describe the bug**
+<!-- A clear and concise description of what the bug is. Please, explain whether it's a build time error or a runtime error. More detailed logs can be easily obtained by following the instructions in this guide: https://docs.nativescript.org/get-support#how-to-obtain-diagnostic-reports. -->
+
+**To Reproduce**
+<!-- Add commands used or steps taken to reproduce the behaviour. -->
+
+**Expected behavior**
+
+**Sample project**
+<!-- If possible, consider attaching a sample project or link to a repository with such project. -->
+
+**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 00000000..39709098
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]. --> 
+
+**Describe the solution you'd like**
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!-- Add any other context or screenshots about the feature request here. -->