diff --git a/.github/ISSUE_TEMPLATE/bcidea.yaml b/.github/ISSUE_TEMPLATE/bcidea.yaml
index 6fcf99c198..3e99694857 100644
--- a/.github/ISSUE_TEMPLATE/bcidea.yaml
+++ b/.github/ISSUE_TEMPLATE/bcidea.yaml
@@ -1,5 +1,5 @@
-name: Suggest a feature for contribution
-description: Suggest a feature you would like to implement, which is based on a BC idea.
+name: Implement a BC Idea
+description: Suggest a BC Idea you would like to implement.
 title: "[BC Idea]: "
 labels: ["bcidea"]
 body:
@@ -32,3 +32,12 @@ body:
       placeholder: Description of BC Idea
     validations:
       required: true
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: I will provide the implementation for this BC Idea
+      description: | 
+        To provide the implementation for a BC idea, select this checkbox and then Get started. Thanks for contributing. 
+      options:
+        - label: I will provide the implementation for this BC Idea
+          required: true
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 78879c786b..d216cf3fe8 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -1,4 +1,4 @@
-name: Report and address a bug
+name: Fix a bug
 description: Create a bug report for a product defect you would like to address yourself
 title: "[Bug]: "
 labels: ["bug"]
@@ -47,4 +47,13 @@ body:
       description: If needed add any other context about the problem here or include screenshots
       placeholder: Additional context, screenshots, log output, etc.
     validations:
-      required: true
+      required: false
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: I will provide a fix for a bug
+      description: | 
+        To provide a fix for a bug, select this checkbox and then Get started. Thanks for contributing. 
+      options:
+        - label: I will provide a fix for a bug
+          required: true