diff --git a/.github/mergify.yml b/.github/mergify.yml
index 107cb9d1703..f3a2f46bd46 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -5,7 +5,7 @@ defaults:
       commit_message_template: |
         {{ title }} (#{{ number }})
         
-        {{ body | get_section("## Commit Message body", "") }}   
+        {{ body | get_section("## Description", "") }}   
 
 pull_request_rules:
   - name: Ask to resolve conflict
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 900c4d5cc3c..60d06fee8ed 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,12 +1,16 @@
-# Description
+## Description
 
 <!-- Please write a summary of your changes and why you made them.-->
+<!-- This section will appear as the commit message after merging. Please craft it accordingly. -->
+
+## Notes
+
+<!-- Any notes or remarks you'd like to make about the PR. -->
 
 ## Links to any relevant issues
 
 <!-- Reference any related issues.-->
 
-
 ## Open Questions
 
 <!-- Unresolved questions, if any. -->
@@ -19,6 +23,3 @@
 - [ ] I have made corresponding changes to the documentation
 - [ ] I have added tests that prove my fix is effective or that my feature works
 - [ ] A changelog entry has been made in the appropriate crates
-
-<!-- The below text will appear as the commit message body once we squash-merge the PR. -->
-## Commit message body