diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..002c220
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve
+labels: 'bug'
+---
+<!--- Please provide us the following info -->
+
+## Description of the Error
+<!--- Tell us what happened -->
+
+## Expected Behaviour
+<!--- Tell us what should happen -->
+
+## Actual Behaviour
+<!--- Tell us what happens instead of the expected behavior -->
+
+## Steps to Reproduce
+<!--- A set of specific instructions to reproduce the bug. Include code, if relevant -->
+
+
+## Link to online environment
+<!--- Please provide a link to Stackblitz or similar tool that allows us to reproduce your error in a preconfigured online environment -->
+ 
+<!--- If you provided a link to Stackblitz or similar, you can ignore the remaining fields. 
+Otherwise, please provide the following information -->
+
+## Manifest File That Generated the Error
+
+<!--- Provide the manifest file that you ran that generated the error-->
+
+## Links to Any Additional Code
+<!--- E.g. your plugin code, it must be available online -->
+
+## Runtime Info
+<!--- Such as OS, node version, package.json, IF version -->
diff --git a/.github/ISSUE_TEMPLATE/feedback.md b/.github/ISSUE_TEMPLATE/feedback.md
index 5b29364..fc3d90c 100644
--- a/.github/ISSUE_TEMPLATE/feedback.md
+++ b/.github/ISSUE_TEMPLATE/feedback.md
@@ -1,9 +1,10 @@
 ---
 name: Feedback
 about: Submitting feedback on plugin template
-title: "Feedback - "
-labels: feedback
+title: 'Feedback - '
+labels: ''
 assignees: ''
+
 ---
 
 ## Scope