diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index abbfa70575..4ff3d06c3c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 ---
 default_install_hook_types:
   - pre-commit
-  - prepare-commit-msg
+  - commit-msg
   - pre-push
   - post-checkout
 
@@ -22,7 +22,7 @@ repos:
         pass_filenames: false
         always_run: true
         stages:
-          - prepare-commit-msg
+          - commit-msg
       - id: make-lint
         name: Run make lint (pre-push gate)
         entry: make lint
diff --git a/Makefile b/Makefile
index d83ca29877..e79e2c0b49 100644
--- a/Makefile
+++ b/Makefile
@@ -745,7 +745,7 @@ test-main-merged:
 	@bash scripts/git/assert/main_merged.sh
 
 .PHONY: test-merge-signed
-# Verify every commit an in-progress merge brings in (HEAD..MERGE_HEAD) is signed (prepare-commit-msg gate).
+# Verify every commit an in-progress merge brings in (HEAD..MERGE_HEAD) is signed (commit-msg gate).
 test-merge-signed:
 	@bash scripts/git/assert/merge_signed.sh