diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 6bcce42f549..066b2d920a2 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -14,4 +14,4 @@ A clear and concise description of what you want to happen.
 A clear and concise description of any alternative solutions or features you've considered.
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
\ No newline at end of file
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md
index 4530e84c8f8..886bcf81136 100644
--- a/.github/ISSUE_TEMPLATE/support.md
+++ b/.github/ISSUE_TEMPLATE/support.md
@@ -1,6 +1,6 @@
 ---
 name: Support request
-about: Please use our forums (community.ory.sh) or the chat (ory.sh/chat) to ask for support.
+about: Please use our forums (community.ory.sh) or the chat (ory.sh/chat) to ask for support
 
 ---
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2e616c5df57..8dffeeb983c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,28 +1,14 @@
-<!--
-Before submitting this pull request, please
-
-1. discuss the changes with maintainers either at the
-[ORY Community](https://community.ory.sh/) or join the [ORY Chat](https://www.ory.sh/chat). Depending on the scope
-and size of your change, we might want to discuss how the issue should be addressed. You may submit your pull request
-regardless, but review time might be longer with more requested changes form maintainers.
-2. make sure to sign our [Developer's Certificate of Origin](https://github.com/ory/keto/blob/master/CONTRIBUTING.md#developers-certificate-of-origin)
-by signing your commit(s). You can amend your signature to the most recent commit by using `git commit --amend -s`. If you
-amend the commit, you might need to force push using `git push --force HEAD:<branch>`. Please be very careful when using
-force push.
-3. If this PR addresses an undocumented security issue, please refrain from proposing the change now and notify us about
-this issue by sending an email to [hi@ory.sh](mailto:hi@ory.sh) instead. We will respond within 24 hours.
-
-Please remove this text once you completed these steps.
--->
-
 ## Related issue
 
 <!--
 Please link the GitHub issue this pull request resolves in the format of `#1234`. If you discussed this change
 with a maintainer, please mention her/him using the `@` syntax (e.g. `@aeneasr`).
 
-If this change neither resolves an existing issue nor has sign-off from one of the maintainers, there is a non-zero
+If this change neither resolves an existing issue nor has sign-off from one of the maintainers, there is a
 chance substantial changes will be requested or that the changes will be rejected.
+
+You can discuss changes with maintainers either in the [ORY Community Forums](https://community.ory.sh/) or
+join the [ORY Chat](https://www.ory.sh/chat).
 -->
 
 ## Proposed changes
@@ -34,18 +20,24 @@ Describe the big picture of your changes here to communicate to the maintainers
 ## Checklist
 
 <!--
-_Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of
-them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code._
+Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of
+them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
 -->
 
 - [ ] I have read the [contributing guidelines](CONTRIBUTING.md)
+- [ ] I confirm that this pull request does not address a security vulnerability. If this pull request addresses a security
+vulnerability, I confirm that I got green light (please contact [hi@ory.sh](mailto:hi@ory.sh)) from the maintainers to push the changes.
+- [ ] I signed the [Developer's Certificate of Origin](https://github.com/ory/keto/blob/master/CONTRIBUTING.md#developers-certificate-of-origin)
+by signing my commit(s). You can amend your signature to the most recent commit by using `git commit --amend -s`. If you
+amend the commit, you might need to force push using `git push --force HEAD:<branch>`. Please be very careful when using
+force push.
 - [ ] I have added tests that prove my fix is effective or that my feature works
 - [ ] I have added necessary documentation within the code base (if appropriate)
-- [ ] I have documented my changes in the [developer guide](https://github.com/ory/docs) (if appropriate, applies only to ORY Hydra, ORY Keto, ORY Oathkeeper).
+- [ ] I have documented my changes in the [developer guide](https://github.com/ory/docs) (if appropriate)
 
 ## Further comments
 
 <!--
 If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution
 you did and what alternatives you considered, etc...
--->
\ No newline at end of file
+-->