From b5be35e057da769457f0b9bf92074efbbd4a4890 Mon Sep 17 00:00:00 2001
From: Franck Royer <franck@status.im>
Date: Tue, 1 Jun 2021 16:16:10 +1000
Subject: [PATCH 1/3] Remove extra contributing file

---
 .github/CONTRIBUTING.md | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 .github/CONTRIBUTING.md

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
deleted file mode 100644
index 5ac541a7c7..0000000000
--- a/.github/CONTRIBUTING.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Example Contributing Guidelines
-
-This is an example of GitHub's contributing guidelines file. Check out GitHub's [CONTRIBUTING.md help center article](https://help.github.com/articles/setting-guidelines-for-repository-contributors/) for more information.

From 50c50c852ce8f3875ea4a3f6f9dd81d31712e242 Mon Sep 17 00:00:00 2001
From: Franck Royer <franck@status.im>
Date: Tue, 1 Jun 2021 16:28:45 +1000
Subject: [PATCH 2/3] Update issue template

Adopting a Problem/Solution format.
---
 .github/ISSUE_TEMPLATE.md | 47 +++++++++++++++++++++++++++++++++------
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 5863654bdc..e41f03387d 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,9 +1,42 @@
-- **I'm submitting a ...**
-  [ ] bug report
-  [ ] feature request
-  [ ] question about the decisions made in the repository
-  [ ] question about how to use this project
+<!-- Delete all but one category --> 
+This is a **bug report/feature or change request/support request**
 
-- **Summary**
+## Problem
 
-- **Other information** (e.g. detailed explanation, stack traces, related issues, suggestions how to fix, links for us to have context, eg. StackOverflow, personal fork, etc.)
+<!--
+Describe in details the problem or scenario that you are facing or trying to solve
+
+If this is a feature request, then focus on the WHY you want the change.
+E.g.: As a user of my dApp, I want to know that X happened when I do Y.
+
+If this is a bug report or support, please provide a code snippet that reproduces the issue or relevant steps.
+Describe the actual behavior vs expected behavior.
+Please also include logs.
+-->
+
+## Proposed Solutions
+
+<!--
+Describe one or several (or none) solutions to fix the problem describe above.
+
+If this is a feature request, then focus on WHAT or HOW you want to see the change happen.
+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.
+
+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.
+-->
+
+## Notes
+
+<!--
+Add any miscellaneous note that are relevant to issue, including but not limited to:
+
+- js-waku version
+- Environment (browser software and version, system software and version)
+- Nodes connected to too (e.g. Status test fleet)
+- etc

From e163849c30ab7f62709899d5dc5c1040ce832453 Mon Sep 17 00:00:00 2001
From: Franck Royer <franck@status.im>
Date: Tue, 1 Jun 2021 16:32:45 +1000
Subject: [PATCH 3/3] Update pull request template

Adopting a Problem/Solution format.
---
 .github/ISSUE_TEMPLATE.md        |  3 ++-
 .github/PULL_REQUEST_TEMPLATE.md | 22 ++++++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

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>