diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index a6efda65..fa894231 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,37 +1,38 @@
 ## Description
-[Provide a detailed description of the changes in this PR]
+<!-- Provide a detailed description of the changes in this PR -->
 
 ## Related Issues
-[Link to related issues using #issue-number format]
+
+<!-- Link to related issues using #issue-number format -->
 
 ## Documentation PR
-[Link to related associated PR in the agent-docs repo]
+
+<!-- Link to related associated PR in the agent-docs repo -->
 
 ## Type of Change
-- Bug fix
-- New feature
-- Breaking change
-- Documentation update
-- Other (please describe):
 
-[Choose one of the above types of changes]
+<!-- Choose one of the following types of changes, delete the rest -->
 
+Bug fix
+New feature
+Breaking change
+Documentation update
+Other (please describe):
 
 ## Testing
-[How have you tested the change?]
 
-* `hatch fmt --linter`
-* `hatch fmt --formatter`
-* `hatch test --all`
-* Verify that the changes do not break functionality or introduce warnings in consuming repositories: agents-docs, agents-tools, agents-cli
+How have you tested the change?  Verify that the changes do not break functionality or introduce warnings in consuming repositories: agents-docs, agents-tools, agents-cli
 
+- [ ] I ran `hatch run prepare`
 
 ## Checklist
 - [ ] I have read the CONTRIBUTING document
-- [ ] I have added tests that prove my fix is effective or my feature works
+- [ ] I have added any necessary tests that prove my fix is effective or my feature works
 - [ ] I have updated the documentation accordingly
-- [ ] I have added an appropriate example to the documentation to outline the feature
+- [ ] I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
 - [ ] My changes generate no new warnings
 - [ ] Any dependent changes have been merged and published
 
+----
+
 By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
diff --git a/pyproject.toml b/pyproject.toml
index bd309732..a13c5f57 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -165,7 +165,11 @@ test = [
 test-integ = [
     "hatch test tests-integ {args}"
 ]
-
+prepare = [
+    "hatch fmt --linter",
+    "hatch fmt --formatter",
+    "hatch test --all"
+]
 
 [tool.mypy]
 python_version = "3.10"