diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
index 0817d09..0fc59e4 100644
--- a/.github/ISSUE_TEMPLATE
+++ b/.github/ISSUE_TEMPLATE
@@ -1,21 +1,20 @@
-<!-- Before submitting an issue, please review the project documentation and search for existing issues. The more details you provide, the easier it will be to diagnose and address the issue. Remove this line before submitting your issue. -->
+<!-- Describe the issue you're encountering in detail. -->
 
-Describe the issue you're encountering in detail.
+## Steps to reproduce
 
-**Issue type**: (Select one)
+<!-- Provide a step-by-step explanation of how to reproduce the issue, including the page or section URL (if relevant). -->
 
-- [ ] Bug
-- [ ] Question
-- [ ] Improvement
+## Error messages and/or screenshots
 
-**Steps to reproduce**:
+<!-- Include any relevant error messages, logs, or screenshots. -->
 
-Provide a step-by-step explanation of how to reproduce the issue.
+## Proposed solution (optional)
 
-**Error messages**:
+<!-- If you have ideas about how this might be fixed, share them here. -->
 
-Include any relevant error messages, logs, or screenshots.
+## Checklist
 
-**Expected behavior**: 
+I confirm that I have:
 
-What were you expecting to happen? This may seem like a silly question, but please be specific.
+- [ ] Checked to see if there are any existing issue that cover this topic.
+- [ ] Linked to any relevant issues across all [entropyxyz](https://github.com/entropyxyz/) repos.
diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
index 7199493..46d574d 100644
--- a/.github/PULL_REQUEST_TEMPLATE
+++ b/.github/PULL_REQUEST_TEMPLATE
@@ -2,24 +2,23 @@
 
 ## Description
 
-<!-- - Quickly describe the changes you made and why you made them. -->
-<!-- - Reference the issue/issues that this PR fixes. -->
+<!-- Quickly describe the changes you made and why you made them. -->
+<!-- Reference the issue/issues that this PR fixes. -->
 
-<!-- - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<!-- - ALL PRs MUST CLOSE AN ISSUE. IF AN ISSUES DOES NOT EXIST, GO MAKE ONE. -->
-<!-- - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<!-- ALL PRs MUST CLOSE AN ISSUE. IF AN ISSUE DOES NOT EXIST, GO MAKE ONE. -->
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 
-## Breaking changes
+### Content updates
 
-<!-- - Does your pull request introduce any breaking changes? If so, please list them clearly and explain how they will affect users.-->
+<!-- List which pages or sections you have created/updated/deleted in this PR. -->
 
 ## Documentation updates
 
-<!-- - Reference any updates to the documentation within this repo.-->
-<!-- - Link to your PR that updates documentation in other repos, like github.com/entropyxyz/entropy-docs-->
+<!-- Have you changed how shortcodes work or how the docs site is rendered? Update the relevant info in this project's `README.md` and/or `CONTRIBUTING.md` files. -->
 
 ## Checklist:
 
-- [ ] I have added tests for my changes.
-- [ ] I have updated the documentation (README, etc.) to reflect the changes.
-- [ ] I have read and followed the CONTRIBUTE.md guidelines.
+- [ ] I have read and followed the `CONTRIBUTING.md` guidelines.
+- [ ] I have run these changes through a grammar and spell checker.
+- [ ] I have updated the documentation (`README.md`, `CONTRIBUTING.md` etc.) to reflect these changes.