diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index f37e778..b8c5c56 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -7,12 +7,8 @@ assignees: kkafar
 
 ---
 
-<!-- If applicable - remember to add the issue to the EA Rust project  -->
-
 ## Bug description
 
 
-## Expected behaviour
+## Expected behaviour  <!-- ## Possible solution suggestion -->
 
-<!-- This is optional section, fill only if you have some ideas -->
-<!-- ## Possible solution suggestion -->
diff --git a/.github/ISSUE_TEMPLATE/missing-feature.md b/.github/ISSUE_TEMPLATE/missing-feature.md
index 2f30756..5b2609a 100644
--- a/.github/ISSUE_TEMPLATE/missing-feature.md
+++ b/.github/ISSUE_TEMPLATE/missing-feature.md
@@ -7,11 +7,7 @@ assignees: kkafar
 
 ---
 
-<!-- If applicable - remember to add the issue to the EA Rust project  -->
-
 ## Feature description
 
-## Motivation
+## Motivation <!-- Optional section -->
 
-<!-- Optional section -->
-<!-- ## Usage examples -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index cd24767..c581d76 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,12 +2,7 @@
 
 ## Description
 
-<!-- Please describe the motivation & changes introduced by this PR -->
+## Linked issues <!-- Please use "Resolves #<issue_no> syntax in case this PR should be linked to an issue -->
 
-## Linked issues
+## Important implementation details <!-- if any, optional section -->
 
-<!-- Please use "Resolves #<issue_no> syntax in case this PR should be linked to an issue -->
-
-## Important implementation details
-
-<!-- if any, optional section -->