diff --git a/.github/ISSUE_TEMPLATE/bug_issue.md b/.github/ISSUE_TEMPLATE/bug_issue.md
index 60cc293..ecd431b 100644
--- a/.github/ISSUE_TEMPLATE/bug_issue.md
+++ b/.github/ISSUE_TEMPLATE/bug_issue.md
@@ -2,6 +2,7 @@
 name: Report a bug
 about: Report a bug to help us improve
 title: "[Brief description]"
+labels: ["bug"]
 ---
 
 <!--
@@ -63,3 +64,8 @@ Tell us about your environment, including:
 -->
 
 …
+
+<!--
+AI DISCLOSURE: If this issue was written with AI assistance, add:
+🤖 This issue was written with AI assistance, under supervision, review and final edits by [@username] 🤖
+-->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/enhancement_issue.md b/.github/ISSUE_TEMPLATE/enhancement_issue.md
index f2fde3e..c365113 100644
--- a/.github/ISSUE_TEMPLATE/enhancement_issue.md
+++ b/.github/ISSUE_TEMPLATE/enhancement_issue.md
@@ -26,3 +26,9 @@ Instructions:
 
 ## Possible tradeoffs
 <!-- (Optional) Explain possible issues/costs that could arise - if any - from implementing this enhancement -->
+
+
+<!--
+AI DISCLOSURE: If this issue was written with AI assistance, add:
+🤖 This issue was written with AI assistance, under supervision, review and final edits by [@username] 🤖
+-->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/epic_issue.md b/.github/ISSUE_TEMPLATE/feature_issue.md
similarity index 82%
rename from .github/ISSUE_TEMPLATE/epic_issue.md
rename to .github/ISSUE_TEMPLATE/feature_issue.md
index 3f3386b..c9611f4 100644
--- a/.github/ISSUE_TEMPLATE/epic_issue.md
+++ b/.github/ISSUE_TEMPLATE/feature_issue.md
@@ -1,9 +1,9 @@
 ---
-name: Epic
-about: Create a project epic
+name: Feature issue
+about: Create an issue for a whole project
 title: "[Release name or version]: [Project Name]"
-labels: epic
-assignees: ''
+labels: ["Feature"]
+type: Tracking Issue
 
 ---
 
@@ -29,7 +29,7 @@ _[Fill this out as people are assigned]_
 - Who is this feature for?  Outline user stories below, but also mention if there is a specific partner and/or deployment
 - How do we know this feature is successful?
 
-#### User Stories or Requirements
+### User Stories or Requirements
 _[Break down the main workflows thematically, but still at a high level. How are the goals of the project realized in the UI? If there isn't a UI portion of this project, what are the key outcomes or improvements? There should probably only be a few of these per project]_
 
 ### Target Quarter and Due date
@@ -37,4 +37,10 @@ _[Break down the main workflows thematically, but still at a high level. How are
     - If there is a specific due date, especially for a contractual deliverable, include it. Otherwise, include an estimated delivery date, and what quarter(s) this will be worked on
 
 ### Product Issues
-_[Issues should be linked here as they are created. There will probably be 1-2 per User Story]_
+_[Issues should be attached as sub issues as they are created. There will probably be 1-2 per User Story]_
+
+
+<!--
+AI DISCLOSURE: If this issue was written with AI assistance, add:
+🤖 This issue was written with AI assistance, under supervision, review and final edits by [@username] 🤖
+-->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/other_issue.md b/.github/ISSUE_TEMPLATE/other_issue.md
index 9b00259..d3916a4 100644
--- a/.github/ISSUE_TEMPLATE/other_issue.md
+++ b/.github/ISSUE_TEMPLATE/other_issue.md
@@ -4,3 +4,10 @@ about: For issues that don't fit any other category
 ---
 
 ## Description
+
+
+
+<!--
+AI DISCLOSURE: If this issue was written with AI assistance, add:
+🤖 This issue was written with AI assistance, under supervision, review and final edits by [@username] 🤖
+-->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/product_issue.md b/.github/ISSUE_TEMPLATE/product_issue.md
index 127c93c..ef14707 100644
--- a/.github/ISSUE_TEMPLATE/product_issue.md
+++ b/.github/ISSUE_TEMPLATE/product_issue.md
@@ -1,8 +1,7 @@
 ---
 name: Product issue
 about: Create a product issue
-assignees: ''
-
+type: Tracking Issue
 ---
 
 _[General guidance: Product issues should describe the feature, but are not actually technically specced for dev work.]_
@@ -11,13 +10,19 @@ _[General guidance: Product issues should describe the feature, but are not actu
 
 _[First, the workflow in one sentence]_
 
-#### Description and outcomes
+### Description and outcomes
 _[Then, more detail. Provide a short summary and/or list key outcomes that the user should be able to accomplish with this feature.]_
 
 
 
-#### Resources
+### Resources
 - _[Link Gherkin Scenarios]_
 - _[Link Figma Scenarios]_
 
-#### Accessibility Requirements
+### Accessibility Requirements
+
+
+<!--
+AI DISCLOSURE: If this issue was written with AI assistance, add:
+🤖 This issue was written with AI assistance, under supervision, review and final edits by [@username] 🤖
+-->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/technical_task_issue.md b/.github/ISSUE_TEMPLATE/technical_task_issue.md
new file mode 100644
index 0000000..3c34aa1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/technical_task_issue.md
@@ -0,0 +1,107 @@
+---
+name: Technical Task Issue
+about: A single technical task, typically part of a tracking issue or product issue
+type: Task
+---
+
+<!--
+Instructions:
+- Fill in Overview, The Change, and Acceptance Criteria (required)
+- Delete any optional sections you don't need
+- Remove all instructional comments before submitting
+-->
+
+## Overview
+
+<!-- 
+Describe what needs to be done and why.
+Keep it brief - a few sentences.
+-->
+
+**Complexity:** Low | Medium | High
+
+### Context
+
+<!--
+OPTIONAL - Delete if not needed.
+
+Provide background needed to understand the task:
+- For bugs: current behavior, code snippets, error messages
+- For frontend work: screenshots of current state
+- For refactors: relevant existing implementation details
+
+Do NOT provide the solution - equip the developer to find it.
+-->
+
+### The Change
+
+<!--
+Describe what needs to change and the general direction.
+- For frontend new features: include screenshots/mockups of desired end state
+- For backend work: describe the expected behavior, not the implementation
+
+Focus on WHAT and WHY, less on HOW. The developer determines the implementation, but if this needs to fit into a specific broader architecture, constraints, or codebase standard patterns, this should be included.
+-->
+
+### How to Get There
+
+<!--
+OPTIONAL - Delete if not needed.
+
+For frontend or user-facing changes:
+- Navigation steps to reach the relevant UI
+- Steps to reproduce a bug
+
+For backend:
+- How to trigger the relevant code path
+-->
+
+### Out of Scope
+
+<!--
+OPTIONAL - Delete if not needed.
+
+Explicitly list what should NOT be changed as part of this task.
+Helps prevent scope creep and keeps PRs focused.
+-->
+
+### Acceptance Criteria
+
+<!--
+Checklist of requirements for the task to be considered complete.
+All items should be verifiable.
+
+For frontend tasks, consider adding subsections:
+#### General
+#### Accessibility and i18n  
+#### Testing
+
+For backend tasks, consider:
+#### General
+#### Testing
+-->
+
+- [ ] 
+
+### Testing
+
+<!--
+OPTIONAL - Delete if not needed.
+
+Specific test commands or manual verification steps.
+Only include if there are task-specific testing requirements
+beyond what's in Acceptance Criteria.
+-->
+
+### References
+
+<!--
+OPTIONAL - Delete if not needed.
+
+Links to documentation, code references, or relevant libraries.
+-->
+
+<!--
+AI DISCLOSURE: If this issue was written with AI assistance, add:
+🤖 This issue was written with AI assistance, under supervision, review and final edits by [@username] 🤖
+-->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/technical_tracking_issue.md b/.github/ISSUE_TEMPLATE/technical_tracking_issue.md
new file mode 100644
index 0000000..2cc677a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/technical_tracking_issue.md
@@ -0,0 +1,58 @@
+---
+name: Technical Tracking Issue
+about: A parent issue that encompasses multiple related technical tasks
+title: ''
+type: Tracking Issue
+---
+
+<!--
+Instructions:
+- Fill in Overview and Scope (required)
+- Delete any optional sections you don't need
+- Remove all instructional comments before submitting
+-->
+
+## Overview
+
+<!-- 
+Describe what this tracking issue encompasses and why the work matters.
+Keep it concise: 3-5 sentences covering the "what" and "why".
+-->
+
+### Scope
+
+<!--
+Define boundaries clearly.
+- What's included in this tracking issue
+- What's explicitly excluded
+-->
+
+### Guidance
+
+<!--
+OPTIONAL - Delete if not needed.
+Include setup instructions, documentation links, or reference materials 
+that apply across all sub-tasks. Especially useful for community-facing projects.
+-->
+
+### Strategy
+
+<!--
+OPTIONAL - Delete if not needed.
+Describe the high-level approach if it's non-obvious or requires coordination
+across sub-tasks, including overall architectural considerations, and requirements.
+Remove if the approach is straightforward.
+-->
+
+### Testing Requirements
+
+<!--
+OPTIONAL - Delete if not needed.
+Only include if there's a unifying test strategy across sub-tasks.
+Otherwise, leave testing guidance to individual task issues.
+-->
+
+<!--
+AI DISCLOSURE: If this issue was written with AI assistance, add:
+🤖 This issue was written with AI assistance, under supervision, review and final edits by [@username] 🤖
+-->
\ No newline at end of file