diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index e41f03387d..5b2bc44c99 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -25,7 +25,7 @@ Feel free to itemize requirements. E.g.:
 - Function `foo` must return information about `bar`.
 - Function `blah` must allow me to pass argument `boo`.
 
-Or describe current vs wanted behaviour.
+Or describe current vs wanted behavior.
 
 If this is a bug report and you know how to fix the problem, feel free to include a proposal or open a PR.
 Or feel free to omit this section.
@@ -40,3 +40,4 @@ Add any miscellaneous note that are relevant to issue, including but not limited
 - Environment (browser software and version, system software and version)
 - Nodes connected to too (e.g. Status test fleet)
 - etc
+-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index e04147782f..31c60f16d1 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,21 @@
-- **What kind of change does this PR introduce?** (Bug fix, feature, docs update, ...)
+## Problem
 
-- **What is the current behavior?** (You can also link to an open issue here)
+<!--
+Describe in details the problem or scenario that this PR is fixing.
 
-- **What is the new behavior (if this is a feature change)?**
+If this is a feature addition or change, then focus on the WHY you are making the change.
+E.g.: As a user of my dApp, I want to know that X happened when I do Y.
 
-- **Other information**:
+If this is a bug fix, please describe why the old behavior was problematic.
+-->
+
+## Solution
+
+<!-- describe the new behavior --> 
+
+## Notes
+
+<!-- Remove items that are not relevant -->
+
+- Resolves <issue number>
+- Related to <link to specs>