diff --git a/.github/ISSUE_TEMPLATE/bug-cli.yaml b/.github/ISSUE_TEMPLATE/bug-cli.yaml
index cb02f8a47d..fda212fe4f 100644
--- a/.github/ISSUE_TEMPLATE/bug-cli.yaml
+++ b/.github/ISSUE_TEMPLATE/bug-cli.yaml
@@ -19,7 +19,10 @@ body:
         - 1.6.0
         - 1.6.1
         - 1.6.2
+        - 1.6.3
         - 1.7.0
+        - 1.7.1
+        - 1.7.2
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/bug-other.yaml b/.github/ISSUE_TEMPLATE/bug-other.yaml
index 57bf39df9a..bf6ab6461a 100644
--- a/.github/ISSUE_TEMPLATE/bug-other.yaml
+++ b/.github/ISSUE_TEMPLATE/bug-other.yaml
@@ -18,7 +18,10 @@ body:
         - 1.6.0
         - 1.6.1
         - 1.6.2
+        - 1.6.3
         - 1.7.0
+        - 1.7.1
+        - 1.7.2
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/bug-webhook.yaml b/.github/ISSUE_TEMPLATE/bug-webhook.yaml
index dae05857f4..da04eb2fd0 100644
--- a/.github/ISSUE_TEMPLATE/bug-webhook.yaml
+++ b/.github/ISSUE_TEMPLATE/bug-webhook.yaml
@@ -18,7 +18,10 @@ body:
         - 1.6.0
         - 1.6.1
         - 1.6.2
+        - 1.6.3
         - 1.7.0
+        - 1.7.1
+        - 1.7.2
     validations:
       required: true
   - type: dropdown
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 5f6f2166da..2ca959acb4 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,11 @@
+## Explanation
+
+<!--
+In a couple sentences, explain why this PR is needed and what it addresses. This should be an explanation a non-developer user can understand and covers the "why" question. It should also clearly indicate whether this PR represents an addition, a change, or a fix of existing behavior. This explanation will be used to assist in the release note drafting process.
+
+THIS IS MANDATORY.
+-->
+
 ## Related issue
 
 <!--