diff --git a/.github/required-checks.json b/.github/required-checks.json
index cedadab..836914a 100644
--- a/.github/required-checks.json
+++ b/.github/required-checks.json
@@ -11,11 +11,6 @@
       "jobId": "verdict",
       "jobName": "Verdict",
       "uiLabel": "CI / Verdict"
-    },
-    {
-      "context": "pre-commit-hooks",
-      "workflow": ".github/workflows/formatting-pre-commit-check.yml",
-      "jobName": "CI / Pre-commit hooks"
     }
   ],
   "branchProtection": {
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d9adafd..62d5107 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -45,6 +45,12 @@ repos:
         language: system
         types: [shell]
 
+  - repo: https://github.com/compilerla/conventional-pre-commit
+    rev: v3.0.0
+    hooks:
+      - id: conventional-pre-commit
+        stages: [commit-msg]
+
   - repo: https://github.com/rhysd/actionlint
     rev: v1.7.11
     hooks:
diff --git a/Makefile b/Makefile
index a71939b..7d3e92e 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ typecheck: ## Run mypy and pyright.
 	$(RUN) pyright
 
 actionlint: ## Run the actionlint pre-commit hook.
-	$(PRE_COMMIT) run actionlint --all-files
+	PRE_COMMIT_TIMEOUT=120 $(PRE_COMMIT) run actionlint --all-files
 
 shellcheck: ## Run ShellCheck through the pre-commit hook.
 	$(PRE_COMMIT) run shellcheck --all-files
diff --git a/README.md b/README.md
index 072583b..c3ab70b 100644
--- a/README.md
+++ b/README.md
@@ -232,3 +232,4 @@ clawops devflow status --run-id <run-id>
 clawops devflow resume --run-id <run-id> --approved-by operator
 clawops devflow audit --run-id <run-id>
 ```
+# Testing conventional commits