diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 60c64a8..ceccdaf 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,14 +9,14 @@ assignees: ''
 
 <!-- if this is a question, consider using the discussion section of this repo -->
 
-**Describe the bug**
+**Description**
 <!-- a detailed description of the bug -->
 
-**To Reproduce**
-<!-- Steps to reproduce the behavior -->
+**Step To Reproduce**
+<!-- Steps or code snippet to reproduce the behaviour -->
 
-**Expected behavior**
+**Expected behaviour**
 <!-- A clear and concise description of what you expected to happen -->
 
-**Screenshots/Snippets**
-<!-- If applicable, add screenshots or code snippets to help explain your problem -->
+**Actual behaviour**
+<!-- what testify does -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 24c33ac..50d2ee0 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -13,10 +13,7 @@ assignees: ''
 <!-- A clear and concise description of what feature you are proposing -->
 
 **Proposed solution**
-<!-- A clear and concise description of what you want to happen -->
+<!-- Optionally a suggested implementation -->
 
 **Use case**
-<!-- A clear and concise description of any alternative solutions or features you've considered -->
-
-**Any additional context**
-<!-- Add any other context or screenshots about the feature request here -->
+<!-- What is the motivation? What workarounds have you used? -->