diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..5ef9b1b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,29 @@
+---
+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):
+
+**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, provide a link from the [Playground](https://play.nativescript.org) with reproduction of the problem. If not, 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 0000000..3970909
--- /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. -->
diff --git a/.github/issue_template.md b/.github/issue_template.md
deleted file mode 100644
index d103b9f..0000000
--- a/.github/issue_template.md
+++ /dev/null
@@ -1,28 +0,0 @@
-### Make sure to check the demo app(s) for sample usage 
-
-### Make sure to check the existing issues in this repository 
-
-### If the demo apps cannot help and there is no issue for your problem, tell us about it
-Please, ensure your title is less than 63 characters long and starts with a capital
-letter.
-
-### Which platform(s) does your issue occur on?
-- iOS/Android/Both 
-- iOS/Android versions 
-- emulator or device. What type of device?
-
-### Please, provide the following version numbers that your issue occurs with:
-
-- CLI: (run `tns --version` to fetch it)
-- Cross-platform modules: (check the 'version' attribute in the
-`node_modules/tns-core-modules/package.json` file in your project)
-- Runtime(s): (look for the `"tns-android"` and `"tns-ios"` properties in the `package.json` file of your project)
-- Plugin(s): (look for the version numbers in the `package.json` file of your
-project and paste your dependencies and devDependencies here)
-
-### Please, tell us how to recreate the issue in as much detail as possible. 
-Describe the steps to reproduce it.
-
-### Is there any code involved? 
- - provide a code example to recreate the problem 
- - (EVEN BETTER) provide a .zip with application or refer to a repository with application where the problem is reproducible.