From 83ae24fc4e2a4c3f51b513187656b14883622ba0 Mon Sep 17 00:00:00 2001
From: Sarto <ghostinhershell@users.noreply.github.com>
Date: Tue, 7 Apr 2026 15:42:39 -0700
Subject: [PATCH 1/2] Revise code security discussion template

Updated the Code Security discussion template to enhance clarity and usability.
---
 .github/DISCUSSION_TEMPLATE/code-security.yml | 47 +++++++++++++++++--
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/.github/DISCUSSION_TEMPLATE/code-security.yml b/.github/DISCUSSION_TEMPLATE/code-security.yml
index 4c3d278d9..8ee9586e4 100644
--- a/.github/DISCUSSION_TEMPLATE/code-security.yml
+++ b/.github/DISCUSSION_TEMPLATE/code-security.yml
@@ -1,18 +1,57 @@
 labels: ["Code Security", source:ui]
 body:
+- type: markdown
+  attributes:
+    value: |
+      🔐 **Welcome to the Code Security Category!** 🔐
+
+      This is your community for all things related to GitHub's code security features — from finding vulnerabilities in your code to keeping your dependencies safe and your secrets secure.
+
+      **What belongs here?**
+      - Questions about setting up or configuring code security features
+      - Bug reports for unexpected behavior in security tools
+      - Product feedback and feature requests to improve code security on GitHub
+
+      **How to best use this category:**
+      - **Have a Question?** Select "Question" below and our community will help you troubleshoot and find answers.
+      - **Product Feedback?** Have ideas to improve GitHub's code security experience? Select "Product Feedback" to share what works (or doesn't) for you.
+      - **Found a Bug?** If something isn't working as expected, select "Bug" so we can investigate.
+
+      After choosing your discussion type, pick the topic area that best matches your discussion.
+
+      **Quick links:** [Code Security Documentation](https://docs.github.com/en/code-security), [Secret Scanning Docs](https://docs.github.com/en/code-security/secret-scanning), [Code Scanning Docs](https://docs.github.com/en/code-security/code-scanning), [Dependabot Docs](https://docs.github.com/en/code-security/dependabot), [Supply Chain Security Docs](https://docs.github.com/en/code-security/supply-chain-security)
+
 - type: dropdown
+  id: reason
   attributes:
     label: "🏷️ Discussion Type"
-    description: What would you like to discuss?
+    description: Tell us your goal! Are you asking a question, giving feedback, or reporting a bug?
     options:
       - "Bug"
       - "Product Feedback"
       - "Question"
   validations:
     required: true
+- type: dropdown
+  id: topic
+  attributes:
+    label: "💬 Feature/Topic Area"
+    description: |
+      Choose the topic area most relevant to your discussion.
+
+      If your post covers additional themes or topics, don't worry! Our team will do our best to add extra labels based on the content of your discussion.
+    options:
+      - "Secret scanning"
+      - "Code scanning"
+      - "Dependabot"
+      - "Supply chain security"
+      - "Code quality"
+  validations:
+    required: true
 - type: textarea
   attributes:
-    label: Body
-    description: Start your discussion!
+    label: Discussion Details
+    description: >-
+      Share your question, feedback, or bug report! Include links, code snippets, or screenshots for more context. Tip: Reference the [Code Security docs](https://docs.github.com/en/code-security) for details.
   validations:
-    required: true
\ No newline at end of file
+    required: true

From bffc0acc34395a6f54f379336b1e8a1b06bbd55f Mon Sep 17 00:00:00 2001
From: Ashley Nicolson <samus-aran@users.noreply.github.com>
Date: Wed, 8 Apr 2026 16:06:44 +0100
Subject: [PATCH 2/2] Update discussion template for code security topics

---
 .github/DISCUSSION_TEMPLATE/code-security.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/DISCUSSION_TEMPLATE/code-security.yml b/.github/DISCUSSION_TEMPLATE/code-security.yml
index 8ee9586e4..60b413ebd 100644
--- a/.github/DISCUSSION_TEMPLATE/code-security.yml
+++ b/.github/DISCUSSION_TEMPLATE/code-security.yml
@@ -41,11 +41,12 @@ body:
 
       If your post covers additional themes or topics, don't worry! Our team will do our best to add extra labels based on the content of your discussion.
     options:
-      - "Secret scanning"
+      - "Code quality"
       - "Code scanning"
       - "Dependabot"
+      - "Secret scanning"
       - "Supply chain security"
-      - "Code quality"
+      - "Other"
   validations:
     required: true
 - type: textarea