diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index ee70ac0..1941a25 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Create a report to help us improve.
 title: ''
 labels: ''
 assignees: ''
@@ -11,11 +11,12 @@ assignees: ''
 A clear and concise description of what the bug is.
 
 ### Which project is your bug related to?
-- [x] Client
-- [ ] ManagedClient
-- [ ] MQTTnet.Server standalone
-- [ ] Server
-- [ ] Generic
+<!-- Remove the items which don't apply from the following list -->
+- Client
+- ManagedClient
+- MQTTnet.Server standalone
+- Server
+- Generic
 
 ### To Reproduce
 Steps to reproduce the behavior:
@@ -35,9 +36,11 @@ Add any other context about the problem here.
 Include debugging or logging information here:
 
 ```batch
+\\ Put your logging output here.
 ```
 ### Code example
  Please provide full code examples below where possible to make it easier for the developers to check your issues.
  
 ```csharp
+\\ Put your code here.
 ```
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
index 8ec115e..fb7bdc3 100644
--- a/.github/ISSUE_TEMPLATE/custom.md
+++ b/.github/ISSUE_TEMPLATE/custom.md
@@ -1,6 +1,6 @@
 ---
 name: Custom issue template
-about: Describe this issue template's purpose here.
+about: Do you have a question related to the project? Use this template.
 title: ''
 labels: ''
 assignees: ''
@@ -10,9 +10,10 @@ assignees: ''
 ### Describe your question
 A clear and concise description of what you want to know.
 
-### Which project is your bug related to?
-- [x] Client
-- [ ] ManagedClient
-- [ ] MQTTnet.Server standalone
-- [ ] Server
-- [ ] Generic
+### Which project is your question related to?
+<!-- Remove the items which don't apply from the following list -->
+- Client
+- ManagedClient
+- MQTTnet.Server standalone
+- Server
+- Generic
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 23a133d..c76e79f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest an idea for this project
+about: Suggest an idea for this project.
 title: ''
 labels: ''
 assignees: ''
@@ -12,11 +12,12 @@ Is your feature request related to a problem? Please describe.
 A clear and concise description of what the problem is. Example. I'm am trying to do [...] but [...]
 
 ### Which project is your feature request related to?
-- [x] Client
-- [ ] ManagedClient
-- [ ] MQTTnet.Server standalone
-- [ ] Server
-- [ ] Generic
+<!-- Remove the items which don't apply from the following list -->
+- Client
+- ManagedClient
+- MQTTnet.Server standalone
+- Server
+- Generic
 
 ### Describe the solution you'd like
 A clear and concise description of what you want to happen.