diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/issue_template.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/issue_template.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 3259778..0000000
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-A good PR should describe what benefit this brings to the repository.
-Ideally, there is an existing issue which the PR address.
-
-Please check the Contributing guide CONTRIBUTING.md for style requirements and
-advice.
--->
-
-# Summary
-
-<!-- Describe in plain English what this PR does -->
-
----
-
-<!-- Add, if any, the related issue here, e.g. #6 -->
-
-**Related issue :**
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 2743250..3259778 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,16 +1,17 @@
 <!--
-it is good practice to first discuss a change before sending a pull request.
-Please provide a reference issue number here, or go back and open a new
-issue
+A good PR should describe what benefit this brings to the repository.
+Ideally, there is an existing issue which the PR address.
+
+Please check the Contributing guide CONTRIBUTING.md for style requirements and
+advice.
 -->
 
-# **Related issue**
+# Summary
 
-## Short summary of changes
+<!-- Describe in plain English what this PR does -->
 
-<!--
-How does this pull request improve our work ?
-This section should be no more than a few lines.
-If your pull request is the result of several commits, you could use their
-summaries here.
--->
+---
+
+<!-- Add, if any, the related issue here, e.g. #6 -->
+
+**Related issue :**