diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index a6287b1..522eec5 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,22 +2,16 @@
 name: Bug report
 about: Create a bug report
 title: ''
-labels: ''
+labels: bug
 assignees: ''
 
 ---
 
-### Description
+**Description:** A clear and concise description of what the bug is.
 
-<!--
-* Please share short description of the problem
-  -->
+**Expected behavior:** A description of what you expected to happen.
 
-### Details
+**Actual behavior:** A description of what is actually happening.
 
-<!--
-* Include the relevant yaml, platform, and dotnet versions in use
-* If an error occurred on a public action, please share a link
-* Include any error messages received in text (search does not work for images)
-* Was this a regression from previous behavior?
-  -->
+**Repro steps:**  
+A description with steps to reproduce the issue. If your have a public example or repo to share, please provide the link.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..76000ca
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,16 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+---
+
+**Description:**
+Describe your proposal.
+
+**Related issue:**
+Add issue link.
+
+**Pull request:**
+Add pull request link (if it exists).
\ No newline at end of file
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..17b416a
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,7 @@
+**Description**: Describe your changes.
+
+**Related issue:** Add link to related issue.
+
+**Documentation changes required:** (Y/N) Mark if documentation changes are required.
+
+**Added tests:** (Y/N) Mark if tests were added or updated according changes.
\ No newline at end of file