diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 1b8b949..d853b78 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -3,11 +3,16 @@ name: "Bug report"
 description: Create a report to help us improve
 labels: "bug"
 body:
-- type: markdown
+- type: checkboxes
   attributes:
-    value: |
-      Before you submit a new bug report, please check the [frequently asked questions and limitations](https://github.com/bruxy70/Garbage-Collection/wiki/Review-before-submitting-a-new-issue-or-feature-request).
-      Also, please search through the existing issues to see if others have had the same problem.
+    label: Before you submit a new bug report, please check that
+    options:
+      - label: I have read [frequently asked questions and limitations](https://github.com/bruxy70/Garbage-Collection/wiki/Review-before-submitting-a-new-issue-or-feature-request)
+        required: true
+      - label: I'm running the newest version of Garbage Collection, or the next pre-release.
+        required: true
+      - label: I have enabled debug logging for my installation.
+        required: true
 - type: textarea
   attributes:
     label: "Describe the bug"
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index c273915..a421091 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -3,11 +3,12 @@ name: "Feature request"
 description: Suggest an idea for this project
 labels: "enhancement"
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        Before you submit a new feature request, please check the [frequently asked questions and limitations](https://github.com/bruxy70/Garbage-Collection/wiki/Review-before-submitting-a-new-issue-or-feature-request).
-        Also, please search through the existing issues to see if others made the same suggestion.
+      label: Before you submit a new bug report, please check that
+      options:
+        - label: I have read [frequently asked questions and limitations](https://github.com/bruxy70/Garbage-Collection/wiki/Review-before-submitting-a-new-issue-or-feature-request)
+          required: true
   - type: textarea
     attributes:
       label: "Is your feature request related to a problem? Please describe."
diff --git a/.github/ISSUE_TEMPLATE/question.yaml b/.github/ISSUE_TEMPLATE/question.yaml
index 1aae7a6..3ba4ba2 100644
--- a/.github/ISSUE_TEMPLATE/question.yaml
+++ b/.github/ISSUE_TEMPLATE/question.yaml
@@ -3,11 +3,12 @@ name: "Question"
 description: I have a question, or need a help with the configuration of the integration or Lovelace
 labels: "question"
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        Before you submit a new question, please check the [frequently asked questions and limitations](https://github.com/bruxy70/Garbage-Collection/wiki/Review-before-submitting-a-new-issue-or-feature-request).
-        Also, please search through the existing issues to see if others made the same question.
+      label: Before you submit a new bug report, please check that
+      options:
+        - label: I have read [frequently asked questions and limitations](https://github.com/bruxy70/Garbage-Collection/wiki/Review-before-submitting-a-new-issue-or-feature-request)
+          required: true
   - type: textarea
     attributes:
       label: "Write your question here"