diff --git a/.github/ISSUE_TEMPLATE/bug_landingPage.yml b/.github/ISSUE_TEMPLATE/bug_landingPage.yml
index 93e5751..6cf8e3a 100644
--- a/.github/ISSUE_TEMPLATE/bug_landingPage.yml
+++ b/.github/ISSUE_TEMPLATE/bug_landingPage.yml
@@ -61,10 +61,15 @@ body:
     validations:
       required: false
   - type: checkboxes
-    id: terms
+    id: no-duplicate-issues
     attributes:
-      label: Contributor terms
-      description: By submitting this issue, you agree to follow our Contributing Instructions. Please read our [Contributing Instructions](https://github.com/CatsInTech/GitHub-ReadMe/blob/main/Contributing.md).
+      label: "Checklist"
       options:
-        - label: I agree to follow the Contributing Instructions
-          required: true
\ No newline at end of file
+        - label: "I have checked the existing [issues](https://github.com/CatsInTech/GitHub-ReadMe/issues)"
+          required: true
+        - label: "I have read the [Contributing Guidelines](https://github.com/CatsInTech/GitHub-ReadMe/blob/main/CONTRIBUTING.md)"
+          required: true
+        - label: "I am willing to work on this issue (optional)"
+          required: false
+        - label: "I am a GSSoC'23 contributor"
+          required: false
diff --git a/.github/ISSUE_TEMPLATE/bug_webapp.yml b/.github/ISSUE_TEMPLATE/bug_webapp.yml
index 14ed68b..0a56e61 100644
--- a/.github/ISSUE_TEMPLATE/bug_webapp.yml
+++ b/.github/ISSUE_TEMPLATE/bug_webapp.yml
@@ -61,10 +61,18 @@ body:
     validations:
       required: false
   - type: checkboxes
-    id: terms
+    id: no-duplicate-issues
     attributes:
-      label: Contributor terms
-      description: By submitting this issue, you agree to follow our Contributing Instructions. Please read our [Contributing Instructions](https://github.com/CatsInTech/GitHub-ReadMe/blob/main/Contributing.md).
+      label: "Checklist"
       options:
-        - label: I agree to follow the Contributing Instructions
-          required: true
\ No newline at end of file
+        - label: "I have checked the existing [issues](https://github.com/CatsInTech/GitHub-ReadMe/issues)"
+          required: true
+
+        - label: "I have read the [Contributing Guidelines](https://github.com/CatsInTech/GitHub-ReadMe/blob/main/CONTRIBUTING.md)"
+          required: true
+
+        - label: "I am willing to work on this issue (optional)"
+          required: false
+
+        - label: "I am a GSSoC'23 contributor"
+          required: false
diff --git a/.github/ISSUE_TEMPLATE/docs.yml b/.github/ISSUE_TEMPLATE/docs.yml
index 8d7a8c2..717b793 100644
--- a/.github/ISSUE_TEMPLATE/docs.yml
+++ b/.github/ISSUE_TEMPLATE/docs.yml
@@ -18,10 +18,18 @@ body:
     validations:
       required: true
   - type: checkboxes
-    id: terms
+    id: no-duplicate-issues
     attributes:
-      label: Contributor terms
-      description: By submitting this issue, you agree to follow our Contributing Instructions. Please read our [Contributing Instructions](https://github.com/CatsInTech/GitHub-ReadMe/blob/main/Contributing.md).
+      label: "Checklist"
       options:
-        - label: I agree to follow the Contributing Instructions
+        - label: "I have checked the existing [issues](https://github.com/CatsInTech/GitHub-ReadMe/issues)"
           required: true
+
+        - label: "I have read the [Contributing Guidelines](https://github.com/CatsInTech/GitHub-ReadMe/blob/main/CONTRIBUTING.md)"
+          required: true
+
+        - label: "I am willing to work on this issue (optional)"
+          required: false
+
+        - label: "I am a GSSoC'23 contributor"
+          required: false
diff --git a/.github/ISSUE_TEMPLATE/newcomponent_webapp.yml b/.github/ISSUE_TEMPLATE/newcomponent_webapp.yml
index c4c75da..27bc174 100644
--- a/.github/ISSUE_TEMPLATE/newcomponent_webapp.yml
+++ b/.github/ISSUE_TEMPLATE/newcomponent_webapp.yml
@@ -46,10 +46,18 @@ body:
     validations:
       required: false
   - type: checkboxes
-    id: terms
+    id: no-duplicate-issues
     attributes:
-      label: Contributor terms
-      description: By submitting this issue, you agree to follow our Contributing Instructions. Please read our [Contributing Instructions](https://github.com/CatsInTech/GitHub-ReadMe/blob/main/Contributing.md).
+      label: "Checklist"
       options:
-        - label: I agree to follow the Contributing Instructions
-          required: true
\ No newline at end of file
+        - label: "I have checked the existing [issues](https://github.com/CatsInTech/GitHub-ReadMe/issues)"
+          required: true
+
+        - label: "I have read the [Contributing Guidelines](https://github.com/CatsInTech/GitHub-ReadMe/blob/main/CONTRIBUTING.md)"
+          required: true
+
+        - label: "I am willing to work on this issue (optional)"
+          required: false
+
+        - label: "I am a GSSoC'23 contributor"
+          required: false
diff --git a/.github/ISSUE_TEMPLATE/newfeature_landingpage.yml b/.github/ISSUE_TEMPLATE/newfeature_landingpage.yml
index af5e886..1d289f2 100644
--- a/.github/ISSUE_TEMPLATE/newfeature_landingpage.yml
+++ b/.github/ISSUE_TEMPLATE/newfeature_landingpage.yml
@@ -46,10 +46,18 @@ body:
     validations:
       required: false
   - type: checkboxes
-    id: terms
+    id: no-duplicate-issues
     attributes:
-      label: Contributor terms
-      description: By submitting this issue, you agree to follow our Contributing Instructions. Please read our [Contributing Instructions](https://github.com/CatsInTech/GitHub-ReadMe/blob/main/Contributing.md).
+      label: "Checklist"
       options:
-        - label: I agree to follow the Contributing Instructions
-          required: true
\ No newline at end of file
+        - label: "I have checked the existing [issues](https://github.com/CatsInTech/GitHub-ReadMe/issues)"
+          required: true
+
+        - label: "I have read the [Contributing Guidelines](https://github.com/CatsInTech/GitHub-ReadMe/blob/main/CONTRIBUTING.md)"
+          required: true
+
+        - label: "I am willing to work on this issue (optional)"
+          required: false
+
+        - label: "I am a GSSoC'23 contributor"
+          required: false
diff --git a/.github/ISSUE_TEMPLATE/newfeature_webapp.yml b/.github/ISSUE_TEMPLATE/newfeature_webapp.yml
index 30a6271..e282c75 100644
--- a/.github/ISSUE_TEMPLATE/newfeature_webapp.yml
+++ b/.github/ISSUE_TEMPLATE/newfeature_webapp.yml
@@ -46,10 +46,18 @@ body:
     validations:
       required: false
   - type: checkboxes
-    id: terms
+    id: no-duplicate-issues
     attributes:
-      label: Contributor terms
-      description: By submitting this issue, you agree to follow our Contributing Instructions. Please read our [Contributing Instructions](https://github.com/CatsInTech/GitHub-ReadMe/blob/main/Contributing.md).
+      label: "Checklist"
       options:
-        - label: I agree to follow the Contributing Instructions
-          required: true
\ No newline at end of file
+        - label: "I have checked the existing [issues](https://github.com/CatsInTech/GitHub-ReadMe/issues)"
+          required: true
+
+        - label: "I have read the [Contributing Guidelines](https://github.com/CatsInTech/GitHub-ReadMe/blob/main/CONTRIBUTING.md)"
+          required: true
+
+        - label: "I am willing to work on this issue (optional)"
+          required: false
+
+        - label: "I am a GSSoC'23 contributor"
+          required: false