From 1cafb1bc1083d438e1d7ed6d110209d5dff64d1f Mon Sep 17 00:00:00 2001
From: Steffen Kleinle <steffen.kleinle@mailbox.org>
Date: Mon, 15 Jun 2026 10:10:41 +0200
Subject: [PATCH 1/2] Add issue types story, meta and research

---
 .github/ISSUE_TEMPLATE/bug_report.md | 10 ++++---
 .github/ISSUE_TEMPLATE/meta.md       | 25 ++++++++++++++++++
 .github/ISSUE_TEMPLATE/research.md   | 35 +++++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/story.md      | 39 ++++++++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/task.md       |  6 +++++
 5 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/meta.md
 create mode 100644 .github/ISSUE_TEMPLATE/research.md
 create mode 100644 .github/ISSUE_TEMPLATE/story.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index d2f299d576..40f79046bd 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -25,14 +25,18 @@ type: Bug
 
 <!-- The environment where the bug occurs. -->
 
-- Device/Browser:
-- OS version:
-- App version:
+- Device/Browser: N/A
+- OS version: N/A
+- App version: N/A
 
 ### Related Issues
 
 <!-- Link all related issues which are e.g. CMS issues or otherwise related, blocking, duplicating issues, ... -->
 
+N/A
+
 ### Additional Information
 
 <!-- Add any other context (e.g. logs, screenshots, environment, related issues etc.) about the problem here. -->
+
+N/A
diff --git a/.github/ISSUE_TEMPLATE/meta.md b/.github/ISSUE_TEMPLATE/meta.md
new file mode 100644
index 0000000000..dd96ada055
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/meta.md
@@ -0,0 +1,25 @@
+---
+name: "Meta \U0001F4E6"
+about: A high-level tracking issue that groups related issues toward a common goal. Meta issues do not contain implementation work themselves.
+type: Meta
+---
+
+### Goal
+
+<!-- What is the overarching goal or objective this meta issue tracks? -->
+
+### Background & Motivation
+
+<!-- Why are we doing this? What is the business or technical driver? -->
+
+### Related Issues
+
+<!-- Link all related issues which are e.g. CMS issues or otherwise related, blocking, duplicating issues, ... -->
+
+N/A
+
+### Additional Context
+
+<!-- Any other information, links, or references. -->
+
+N/A
diff --git a/.github/ISSUE_TEMPLATE/research.md b/.github/ISSUE_TEMPLATE/research.md
new file mode 100644
index 0000000000..27dd359c5a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/research.md
@@ -0,0 +1,35 @@
+---
+name: "Research \U0001F50E"
+about: A time-boxed investigation to gather information and reduce uncertainty
+type: Research
+---
+
+### Research Question(s)
+
+<!-- What specific question(s) are we trying to answer? -->
+
+### Background & Motivation
+
+<!-- Why are we doing this? What is the business or technical driver? -->
+
+### Time Box
+
+<!-- Maximum time to spend on this research -->
+
+### Results
+
+<!-- Fill this with your research results or links to created artifacts once you are done -->
+
+TBD
+
+### Related Issues
+
+<!-- Link all related issues which are e.g. CMS issues or otherwise related, blocking, duplicating issues, ... -->
+
+N/A
+
+### Additional Context
+
+<!-- Any other information, links, or references. -->
+
+N/A
diff --git a/.github/ISSUE_TEMPLATE/story.md b/.github/ISSUE_TEMPLATE/story.md
new file mode 100644
index 0000000000..fcdbf5642f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/story.md
@@ -0,0 +1,39 @@
+---
+name: "Story \U0001F4D6"
+about: Describe a feature from the user's perspective
+type: Story
+---
+
+### User Story
+
+<!-- Who is this for, what do they want, and why? -->
+
+As a [type of user], I want [goal/desire], so that [benefit/value].
+
+### Problem Description
+
+<!-- Include context about the current state and why it's insufficient. -->
+<!-- What is the current problem, pain point, or gap this story addresses? -->
+
+### Acceptance Criteria
+
+<!-- Specific, testable conditions that must be met for this story to be considered complete. -->
+<!-- Use Given/When/Then or checkbox format. -->
+
+### Related Issues
+
+<!-- Link all related issues which are e.g. CMS issues or otherwise related, blocking, duplicating issues, ... -->
+
+N/A
+
+### Technical Notes
+
+<!-- Any implementation hints, API contracts, data models, or architectural considerations for the developer. -->
+
+N/A
+
+### Additional Context
+
+<!-- Any other information, links, or references. -->
+
+N/A
diff --git a/.github/ISSUE_TEMPLATE/task.md b/.github/ISSUE_TEMPLATE/task.md
index 1b65baa9e0..7050b99d79 100644
--- a/.github/ISSUE_TEMPLATE/task.md
+++ b/.github/ISSUE_TEMPLATE/task.md
@@ -17,10 +17,16 @@ type: Task
 
 <!-- A clear and concise description of any alternative solutions or features you've considered. -->
 
+N/A
+
 ### Related Issues
 
 <!-- Link all related issues which are e.g. CMS issues or otherwise related, blocking, duplicating issues, ... -->
 
+N/A
+
 ### Additional Information
 
 <!-- Add any other context (e.g. logs, screenshots, environment, related issues etc.) about the problem here. -->
+
+N/A

From 585af22e43d1faf615bc4d55a60512405b43f807 Mon Sep 17 00:00:00 2001
From: Steffen Kleinle <steffen.kleinle@mailbox.org>
Date: Mon, 15 Jun 2026 10:21:44 +0200
Subject: [PATCH 2/2] Add checklist for PR template

---
 .github/PULL_REQUEST_TEMPLATE.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index a1f0de783b..0273b55f61 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -13,7 +13,15 @@
 
 <!-- List all related components that have not been explicitly changed but may be affected by this PR -->
 
--
+N/A
+
+### Checklist
+
+- [ ] Followed the [contributing guidelines](../docs/contributing.md) and [conventions](../docs/conventions.md)
+- [ ] Considered accessibility impacts and made the necessary adjustments
+- [ ] Added or updated unit tests (if applicable)
+- [ ] Added or updated documentation (if applicable)
+- [ ] Added a [release note](../release-notes) for native (if [applicable](../docs/contributing.md#release-notes))
 
 ### Testing