diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 522eec5..70396c9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,11 +7,26 @@ assignees: ''
 
 ---
 
-**Description:** A clear and concise description of what the bug is.
+**Description:**
+A clear and concise description of what the bug is.
 
-**Expected behavior:** A description of what you expected to happen.
+**Expected behavior:**
+A description of what you expected to happen.
 
-**Actual behavior:** A description of what is actually happening.
+**Actual behavior:**
+A description of what is actually happening.
+
+**Task version:**
+Specify the task version
+
+**Platform:**
+- [ ] Ubuntu
+- [ ] macOS
+- [ ] Windows
+
+**Runner type:**
+- [ ] Hosted
+- [ ] Self-hosted
 
 **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
index 76000ca..2e767a3 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,15 +2,9 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: enhancement
+labels: feature request
 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
index 17b416a..169f689 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,7 +1,11 @@
-**Description**: Describe your changes.
+**Description:**
+Describe your changes.
 
-**Related issue:** Add link to related issue.
+**Related issue:**
+Add link to the related issue.
 
-**Documentation changes required:** (Y/N) Mark if documentation changes are required.
+**Documentation changes required:**
+- [ ] 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
+**Test updates**
+- [ ] Mark if tests were added or updated to cover the changes.
\ No newline at end of file