diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2b56eacd..58a6bf0a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,8 @@
 <!-- STEPS TO FOLLOW:
   1. Add a description of the changes (frequently the same as the commit description)
   2. Enter the issue number next to "Resolves #" below (if there is no tracking issue resolved, **remove that section**)
-  3. Follow the steps in the checklist below, starting with the **Commit Message Formatting**.
+  3. Make sure the PR title follows the **Commit Message Formatting**: https://www.conventionalcommits.org/en/v1.0.0/#summary.
+  4. Follow the steps in the checklist below, starting with the **Commit Message Formatting**.
 -->
 
 <!-- Uncomment this section with the issue number if an issue is being resolved
@@ -13,8 +14,6 @@ Resolves #
 
 **Checklist:**
 
-- [ ] **Commit Message Formatting**: Commit titles and messages follow guidelines in the
-  [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/#summary).
 - [ ] Documentation has been updated, if necessary.
 - [ ] Examples have been added, if necessary.
 - [ ] Tests have been added, if necessary.
diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 00000000..b342bbf9
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,15 @@
+merge_protections:
+  - name: Enforce conventional commit
+    description: Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/
+    if:
+      - base = main
+    success_conditions:
+      - "title ~=
+        ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert)(?:\\(.+\
+        \\))?:"
+  - name: Require two reviewer for test updates
+    description: When test data is updated, we require two reviewers
+    if:
+      - base = main
+    success_conditions:
+      - "#approved-reviews-by >= 2"