diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 473d1828..2cda41c2 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -3,17 +3,23 @@ _This template was created based on the work of [`udemy-dl`](https://github.com/
 **In raising this issue, I confirm the following (please check boxes, eg [X]):**
 
 - [ ] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md).
-- [ ] I have verified that the issue I am reporting can be replicated, or that the [feature](https://pi-hole.net/feature-requests/) I am suggesting [isn't already acknowledged](https://github.com/pi-hole/pi-hole/wiki).
-- [ ] I have checked that the issue I'm reporting isn't already solved and no duplicates exist in [closed issues](https://github.com/pi-hole/pi-hole/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20) and in [opened issues](https://github.com/pi-hole/pi-hole/issues)
+- [ ] I have verified that the issue I am reporting can be replicated
+- [ ] I have checked that the issue I'm reporting isn't a duplicate in our [FAQs](https://github.com/pi-hole/pi-hole/wiki/FAQs), [closed issues](https://github.com/pi-hole/pi-hole/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), or [open issues](https://github.com/pi-hole/pi-hole/issues).
 - [ ] I have checked the [pull requests tab](https://github.com/pi-hole/pi-hole/pulls) for existing solutions/implementations to my issue/suggestion.
 - [ ] I have prefixed my issue title with one of the following: _[BUG], [ISSUE], [FEATURE REQUEST], [QUESTION], [OTHER]_.
 
-**My familiarity with the project is as follows (check one, eg [X]):**
+**How familiar are you with the codebase?:**
 
-- [ ] I have never used the project.
-- [ ] I have used the project briefly.
-- [ ] I have used the project extensively, but have not contributed previously.
-- [ ] I am an active contributor to the project.
+- [ ] 1 (very unfamiliar)
+- [ ] 2
+- [ ] 3
+- [ ] 4
+- [ ] 5
+- [ ] 6
+- [ ] 7
+- [ ] 8
+- [ ] 9
+- [ ] 10 (very familiar)
 
 ---
 **(Optional) Debug Log generated by `pihole -d`:**
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index af052392..3eb26862 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -8,12 +8,18 @@ _This template was created based on the work of [`udemy-dl`](https://github.com/
 - [ ] I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
 - [ ] I give this submission freely, and claim no ownership to its content.
 
-**My familiarity with the project is as follows (check one, eg [X]):**
+**How familiar are you with the codebase?:**
 
-- [ ] I have never used the project.
-- [ ] I have used the project briefly.
-- [ ] I have used the project extensively, but have not contributed previously.
-- [ ] I am an active contributor to the project.
+- [ ] 1 (very unfamiliar)
+- [ ] 2
+- [ ] 3
+- [ ] 4
+- [ ] 5
+- [ ] 6
+- [ ] 7
+- [ ] 8
+- [ ] 9
+- [ ] 10 (very familiar)
 
 ---
 _{replace this line with your pull request content}_