diff --git a/.github/ISSUE_TEMPLATE/Feature-request.yml b/.github/ISSUE_TEMPLATE/Feature-request.yml
index d50524433da..0788288036c 100644
--- a/.github/ISSUE_TEMPLATE/Feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/Feature-request.yml
@@ -52,3 +52,11 @@ body:
       label: Additional context
       description: Please add any other context or screenshots about the feature request here.
       placeholder: ex. This would work only when ...
+  - type: checkboxes
+    id: confirmation
+    attributes:
+      label: I have checked existing list of Feature requests and the Contribution Guide
+      description: You agree to check all the resources above before opening a new Feature request.
+      options:
+        - label: I confirm I have checked existing list of Feature requests and Contribution Guide.
+          required: true
diff --git a/.github/ISSUE_TEMPLATE/Issue-report.yml b/.github/ISSUE_TEMPLATE/Issue-report.yml
index f355f26628a..4b0465bb994 100644
--- a/.github/ISSUE_TEMPLATE/Issue-report.yml
+++ b/.github/ISSUE_TEMPLATE/Issue-report.yml
@@ -40,6 +40,7 @@ body:
       description: What version of Arduino ESP32 are you running? If possible, consider updating to the latest version.
       options:
         - latest master
+        - v2.0.2
         - v2.0.1
         - v2.0.0
         - v1.0.6