diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index cfc41b8d1..63e0e64f9 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -8,6 +8,10 @@ labels: "bug"
 
 (A clear and concise description of what the bug is)
 
+## Have you spent some time to check if this issue has been raised before?
+
+(Have you googled for a similar issue or checked our older issues for a similar bug)
+
 ## To Reproduce
 
 (Write your steps here:)
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
index ff1e3bc7e..9aa7e59e1 100644
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -8,6 +8,10 @@ labels: "documentation"
 
 (A clear and concise description of what the issue is.)
 
-### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)?
+## Have you spent some time to check if this issue has been raised before?
+
+(Have you googled for a similar issue or checked our older issues for a similar bug)
+
+### Have you read the [Code of Conduct](https://github.com/appwrite/appwrite/blob/master/CODE_OF_CONDUCT.md)?
 
 (Write your answer here.)
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
index 7d7c7047b..35ad1b9d8 100644
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -8,14 +8,14 @@ labels: "feature"
 
 (A clear and concise description of what the feature is.)
 
-### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)?
+## Have you spent some time to check if this issue has been raised before?
+
+(Have you googled for a similar issue or checked our older issues for a similar bug)
+
+### Have you read the [Code of Conduct](https://github.com/appwrite/appwrite/blob/master/CODE_OF_CONDUCT.md)?
 
 (Write your answer here.)
 
-## Motivation
-
-(Please outline the motivation for the proposal.)
-
 ## Pitch
 
-(Please explain why this feature should be implemented and how it would be used.)
+(Please explain why this feature should be implemented and how it would be used. Add examples, if applicable.)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c03b1c551..faa18b5ab 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,13 +9,9 @@ Happy contributing!
 
 -->
 
-## Motivation
+## What does this PR do?
 
-(Write your motivation here.)
-
-### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)?
-
-(Write your answer here.)
+(Provide a description of what this PR does.)
 
 ## Test Plan
 
@@ -24,3 +20,7 @@ Happy contributing!
 ## Related PRs and Issues
 
 (If this PR is related to any other PR or resolves any issue or related to any issue link all related PR and issues here.)
+
+### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)?
+
+(Write your answer here.)