diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 1f9148e..a99d649 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -29,8 +29,8 @@ body:
         - A bugged action
         - Mod API bugs
         - Other/Not sure
-      validations:
-        required: true
+    validations:
+      required: true
   - type: textarea
     id: description
     attributes:
@@ -62,7 +62,9 @@ body:
     id: TOS
     attributes:
       label: Code of Conduct
-      description: By submitting this issue, you agree to follow the [Code of Conduct](/Alorel/melvor-mod/.github/CODE_OF_CONDUCT.md)
+      description: By submitting this issue, you agree to follow the [code of conduct](/Alorel/melvor-action-workflows/blob/master/.github/CODE_OF_CONDUCT.md)
       options:
-        - label: "I agree"
+        - label: I agree to follow the code of conduct
+          required: true
+        - label: I have searched for similar issues and nothing similar exists
           required: true
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index 84edd1a..a856167 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -24,7 +24,11 @@ body:
     id: TOS
     attributes:
       label: Code of Conduct
-      description: By submitting this issue, you agree to follow the [Code of Conduct](/Alorel/melvor-mod/.github/CODE_OF_CONDUCT.md)
+      description: By submitting this issue, you confirm that the requested feature fits the [contribution guidelines](/Alorel/melvor-action-workflows/blob/master/.github/CONTRIBUTING.md#what-belongs-and-doesnt-belong-in-the-main-mod) & agree to follow the [code of conduct](/Alorel/melvor-action-workflows/blob/master/.github/CODE_OF_CONDUCT.md)
       options:
-        - label: "I agree"
+        - label: I agree to follow the code of conduct
+          required: true
+        - label: My request fits the contribution guidelines
+          required: true
+        - label: I have searched for similar issues and nothing similar exists
           required: true
diff --git a/.github/ISSUE_TEMPLATE/other.yml b/.github/ISSUE_TEMPLATE/other.yml
index 0aec55b..c56b861 100644
--- a/.github/ISSUE_TEMPLATE/other.yml
+++ b/.github/ISSUE_TEMPLATE/other.yml
@@ -1,14 +1,16 @@
-name: Question
-description: General queries
+name: Other
+description: Anything else
 labels: ["question"]
 body:
   - type: checkboxes
     id: TOS
     attributes:
       label: Code of Conduct
-      description: By submitting this issue, you agree to follow the [Code of Conduct](/Alorel/melvor-mod/.github/CODE_OF_CONDUCT.md)
+      description: By submitting this issue, you agree to follow the [code of conduct](/Alorel/melvor-action-workflows/blob/master/.github/CODE_OF_CONDUCT.md)
       options:
-        - label: I agree with the code of conduct
+        - label: I agree to follow the code of conduct
+          required: true
+        - label: I have searched for similar issues and nothing similar exists
           required: true
         - label: My issue does not match any other template better
           required: true
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
index 788ddfd..445946a 100644
--- a/.github/ISSUE_TEMPLATE/question.yml
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -26,7 +26,9 @@ body:
     id: TOS
     attributes:
       label: Code of Conduct
-      description: By submitting this issue, you agree to follow the [Code of Conduct](/Alorel/melvor-mod/.github/CODE_OF_CONDUCT.md)
+      description: By submitting this issue, you agree to follow the [code of conduct](/Alorel/melvor-action-workflows/blob/master/.github/CODE_OF_CONDUCT.md)
       options:
-        - label: "I agree"
+        - label: I agree to follow the code of conduct
+          required: true
+        - label: I have searched for similar issues and nothing similar exists
           required: true