diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 43d1ea0e7..89d0cd999 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -13,31 +13,32 @@ assignees: ''
  For issues containing a fix, please create a Pull Request following this tutorial: https://www.azerothcore.org/wiki/How-to-create-a-PR -->
 
 
-##### CURRENT BEHAVIOUR:
+## CURRENT BEHAVIOUR:
 <!-- Describe the bug or issue in detail, if it includes any quest/spell/item/NPC/object from the game, please use database links from https://wowgaming.altervista.org/aowow/ 
 -->
 
 
 
 
-##### EXPECTED BLIZZLIKE BEHAVIOUR:
+## EXPECTED BLIZZLIKE BEHAVIOUR:
 <!-- Describe how it should be working without the bug/issue 
 -->
 
 
 
 
-##### SOURCE:
-<!-- If this report is linked with in-game content, please include any evidence/documentation/video or further proof in order to guarantee that the behavior described above is the correct one.
+## SOURCE:
+<!-- If this report IS linked with in-game content, please include any evidence/documentation/video or further proof in order to guarantee that the behavior described above is the correct one.
  - If it is described in a guide/post or Wowhead comment, please include the link.
  - Can you link a video that confirms it?
  - Please share the source which states how it should work.
+ - If this report IS NOT linked with in-game content, please leave this field as N/A
 -->
 
 
 
 
-##### STEPS TO REPRODUCE THE PROBLEM:
+## STEPS TO REPRODUCE THE PROBLEM:
 <!-- Describe precisely how to reproduce the bug so we can fix it or confirm its existence:
  - Which commands to use? Which NPC to teleport to?
  - Do we need to have debug flags on Cmake?
@@ -48,7 +49,7 @@ assignees: ''
 2. 
 3. 
 
-##### EXTRA NOTES:
+## EXTRA NOTES:
 <!-- Please share any additional information that can help the developers to identify and fix the issue.
 Examples:
 - Was this bug always present in AzerothCore? if no, from which change/commit it started?
@@ -59,7 +60,7 @@ Examples:
 
 
 
-##### AC HASH/COMMIT:
+## AC HASH/COMMIT:
 <!-- IF YOU DO NOT FILL THIS OUT, WE WILL CLOSE YOUR ISSUE! NEVER WRITE "LATEST", ALWAYS PUT THE ACTUAL VALUE INSTEAD.
 Find the commit hash (unique identifier) by running "git log" on your own clone of AzerothCore or by looking at here https://github.com/azerothcore/azerothcore-wotlk/commits/master 
 -->
@@ -67,7 +68,7 @@ Find the commit hash (unique identifier) by running "git log" on your own clone
 
 
 
-##### OPERATING SYSTEM:
+## OPERATING SYSTEM:
 <!-- On which operating system the bug/issue was found?
  Examples: Windows 7/10, Debian 8/9/10, Ubuntu 16/18 or macOS 10/11 
  -->
@@ -75,14 +76,14 @@ Find the commit hash (unique identifier) by running "git log" on your own clone
 
 
 
-##### MODULES:
+## MODULES:
 <!-- Are you using modules? if yes, please list them all 
 -->
 
 
 
 
-##### CUSTOMIZATIONS:
+## CUSTOMIZATIONS:
 <!-- Are you using any extra content that could affect your client/server?
  - Did you apply any core patch/diff?
  - Did you modify your database?
diff --git a/pull_request_template.md b/pull_request_template.md
index 4473bb8e9..b9e8bfa79 100644
--- a/pull_request_template.md
+++ b/pull_request_template.md
@@ -13,11 +13,12 @@
 <!-- If the issue does not exist, please describe it and how to reproduce it. If the issue already exists, just paste the link to the issue you close, like this: Closes https://github.com/azerothcore/azerothcore-wotlk/issues/967 -->
 
 
-##### SOURCE:
-<!-- If this report is linked with in-game content, please include any evidence/documentation/video or further proof in order to guarantee that the behavior described above is the correct one.
+## SOURCE:
+<!-- If this pull request IS linked with in-game content, please include any evidence/documentation/video or further proof in order to guarantee that the proposed changes described above are the correct ones.
  - If it is described in a guide/post or Wowhead comment, please include the link.
  - Can you link a video that confirms it?
  - Please share the source which states how it should work.
+ - If this pull request IS NOT linked with in-game content, please leave this field as N/A
 -->