diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index da26b408..11c85eac 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -6,6 +6,8 @@ labels: Bug
 assignees: ''
 ---
 
+🔐 🔐 `Should this be a security advisory instead?` 🔐 🔐
+
 _Remenber not to put too much unhelpful information or too little important information, be specific._
 
 ## Impact
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index cd7c4948..a82962bd 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -6,6 +6,8 @@ assignees: ''
 
 ---
 
+🔐 🔐 `Should this be a security advisory instead?` 🔐 🔐
+
 ## Description
 Write a clear and concise description of what you want to happen. Add any considered drawbacks.
 
diff --git a/.github/ISSUE_TEMPLATE/operational_task_template.md b/.github/ISSUE_TEMPLATE/operational_task_template.md
index 3f63735f..c75af6e2 100644
--- a/.github/ISSUE_TEMPLATE/operational_task_template.md
+++ b/.github/ISSUE_TEMPLATE/operational_task_template.md
@@ -7,6 +7,8 @@ assignees: ''
 
 ---
 
+🔐 🔐 `Should this be a security advisory instead?` 🔐 🔐
+
 ## Problem Statement
 - Contains some manner of action item. 
 - Contains the service the action pertains to
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fd6e6e09..9d7591aa 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -150,7 +150,6 @@ jobs:
 
   code-analysis:
     needs: [ filter-commit-changes ]
-    if: ${{ always() && needs.filter-commit-changes.outputs.has-changes-requiring-build == 'true' }}
     uses: ./.github/workflows/codeql.yml
 
   testing: