diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
index 558366ccd..6158f47b7 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.md
+++ b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -24,4 +24,6 @@ _Add more on who asked for this, i.e. company, person, how much they pay us, wha
 ```[tasklist]
 - [ ] Fix the GitHub Projects Labels, Sprint and other Metadata
 - [ ] Refine a Solution Proposal / Work Breakdown
+- [ ] Add security related tasks and checks
+- [ ] Final solution design has been challenged for security related topics
 ```
diff --git a/.github/ISSUE_TEMPLATE/epic_template.md b/.github/ISSUE_TEMPLATE/epic_template.md
index 24edb0b59..390a48995 100644
--- a/.github/ISSUE_TEMPLATE/epic_template.md
+++ b/.github/ISSUE_TEMPLATE/epic_template.md
@@ -13,6 +13,7 @@ assignees: ""
 
 ### Requirements
 <!-- Which requirements do you have to be fulfilled? -->
+<!-- Which security-related requirements must be satisfied? -->
 
 ## Work Breakdown
 <!-- If you already know what needs to be done, plase add a tasklist. -->
@@ -22,6 +23,10 @@ assignees: ""
 - [ ] Create Stories which can be converted into issues
 ```
 
+### Security Constraints
+<!-- Which constraints can be checked that must be covered by the work breakdown? -->
+- [ ] Final solution design has been challenged for security related topics
+
 ## Initiative / goal
 <!-- Describe how this Epic impacts an initiative the business is working on. -->
 
@@ -29,7 +34,7 @@ assignees: ""
 <!-- What is your hypothesis on the success of this Epic? Describe how success will be measured and what leading indicators the team will have to know if success has been hit. -->
 
 ## Acceptance criteria and must have scope
-<!-- Define what is a must-have for launch and in-scope. Keep this section fluid and dynamic until you lock-in priority during planning. Please list your criteria below. -->
+<!-- Define what is a must-have for launch and in-scope (e.g. security-related tasks like successful pen-tests). Keep this section fluid and dynamic until you lock-in priority during planning. Please list your criteria below. -->
 
 ## Stakeholders
 <!-- Describe who needs to be kept up-to-date about this Epic, included in discussions, or updated along the way. Stakeholders can be both in Product/Engineering, as well as other teams like Customer Success who might want to keep customers updated on the epic project. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 5ff7afa21..979aa2a5b 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -31,4 +31,6 @@ assignees: ""
 - [ ] Fix the GitHub Projects Labels, Sprint and other Metadata
 - [ ] Refine a Solution Proposal / Work Breakdown
 - [ ] (For Tech Team): Include acceptance criteria for the sub-tasks of the work breakdown
+- [ ] Add security related tasks and checks
+- [ ] Final solution design has been challenged for security related topics
 ```
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c777e39aa..de7153040 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,7 +4,7 @@ _What issues does this PR close?_
 ```[tasklist]
 ### Checklist
 - [ ] The PR title is short and expressive.
-- [ ] I have updated the CHANGELOG.md. See [changelog_update.md](https://github.com/sovity/authority-portal/tree/main/docs/dev/changelog_updates.md) for more information.
+- [ ] I have updated the CHANGELOG.md and linked the changes to their issues. See [changelog_update.md](https://github.com/sovity/authority-portal/blob/main/docs/dev/changelog_updates.md) for more information.
 - [ ] I have updated the Deployment Migration Notes Section in the CHANGELOG.md for any configuration / external API changes.
 - [ ] I have performed a **self-review**
 ```