diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 37ddca86a..db593de20 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -80,11 +80,9 @@ body:
       label: Validations
       description: Before submitting the issue, please make sure you do the following
       options:
-        # - label: Follow our [Code of Conduct](https://github.com/woodpecker-ci/woodpecker/blob/main/CODE_OF_CONDUCT.md)
-        #   required: true
         - label: Read the [docs](https://woodpecker-ci.org/docs/intro).
           required: true
         - label: Check that there isn't [already an issue](https://github.com/woodpecker-ci/woodpecker/issues) that reports the same bug to avoid creating a duplicate.
           required: true
-        - label: Checked that the bug isn't fixed in the `next` version already [https://woodpecker-ci.org/faq#which-version-of-woodpecker-should-i-use]
+        - label: Checked that the bug isn't fixed in the `next` version already [https://woodpecker-ci.org/versions]
           required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index 93fedada4..153201768 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -37,9 +37,7 @@ body:
       label: Validations
       description: Before submitting the issue, please make sure you do the following
       options:
-        # - label: Follow our [Code of Conduct](https://github.com/woodpecker-ci/woodpecker/blob/main/CODE_OF_CONDUCT.md)
-        #   required: true
-        - label: Checked that the feature isn't part of the `next` version already [https://woodpecker-ci.org/faq#which-version-of-woodpecker-should-i-use]
+        - label: Checked that the feature isn't part of the `next` version already [https://woodpecker-ci.org/versions]
           required: true
         - label: Read the [docs](https://woodpecker-ci.org/docs/intro).
           required: true