diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index d8683ad1..00000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,29 +0,0 @@
-## Type
-
-- [ ] Improvement
-- [ ] Bug
-- [ ] Documentation
-- [ ] Tests
-- [ ] Git / workflow
-- [ ] Other
-
-## Summary
-
-<!-- One short paragraph describing the change and why it's worth doing. -->
-
-## Current behavior
-
-## Desired behavior
-
-## Acceptance criteria
-
-- [ ]
-- [ ]
-
-## Testing notes
-
-<!-- Tests to add, or how the change should be verified. -->
-
-## Extra context
-
-<!-- Errors, screenshots, device details, or links. -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 145ac684..81f32897 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Something in StepForge isn't working as expected
 title: "[BUG] "
-labels: Feature, Potential bug
+labels: Potential bug
 assignees: Twest2
 
 ---
@@ -28,13 +28,22 @@ assignees: Twest2
 ## Your setup
 
 - **StepForge version** (Settings → About):
+  - [ ] It happens on the current version of StepForge (**Settings → About → Check for updates**)
 - **Operating system:**
   - [ ] Windows 10
   - [ ] Windows 11
   - [ ] Ubuntu 26.04
   - [ ] Fedora 44
   - [ ] Other:
-- **Installed with:** <!-- Chocolatey, setup .exe, APT, DNF, .deb/.rpm, portable, source -->
+- **Installed with:**
+  - [ ] Microsoft Store
+  - [ ] Chocolatey
+  - [ ] Setup `.exe` from GitHub Releases
+  - [ ] APT repository
+  - [ ] DNF repository
+  - [ ] `.deb` or `.rpm` from GitHub Releases
+  - [ ] Portable `.tar.gz`
+  - [ ] From source
 - **Linux only, desktop session:** <!-- e.g. GNOME 50 Wayland -->
 
 ## Anything else?
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..89dfba05
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Report a security problem
+    url: https://github.com/Twest2/StepForge/blob/main/docs/SECURITY.md
+    about: Please email git@twestbrook.com instead of opening a public issue.
+  - name: Install and getting started guides
+    url: https://github.com/Twest2/StepForge/blob/main/docs/GETTING_STARTED.md
+    about: Installing StepForge, recording your first guide, and fixes for common problems.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index fb8d8ca3..cc766040 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -14,13 +14,17 @@ Closes #<!-- issue number -->
 
 ## Area
 
-- [ ] Guide editor
 - [ ] Capture / recording
+- [ ] Guide editor
 - [ ] Library
 - [ ] Settings
 - [ ] Exports
-- [ ] Google Drive sync
-- [ ] Packaging / install
+- [ ] Sharing and publishing (GitHub Pages, Confluence, Wiki.js)
+- [ ] Cloud sync (Google Drive, OneDrive, Dropbox, Nextcloud / WebDAV)
+- [ ] AI and AI agents (MCP)
+- [ ] Branding
+- [ ] Translations
+- [ ] Packaging, install, or release (Microsoft Store, Chocolatey, APT, DNF)
 - [ ] Documentation
 - [ ] Tests
 - [ ] Git / workflow
@@ -30,7 +34,7 @@ Closes #<!-- issue number -->
 - [ ] `bash tests/run_test.sh` passes
 - [ ] Tested manually (describe below)
 
-<!-- What you tested, on which OS, and the results. -->
+<!-- What you tested, on which OS and install type, and the results. -->
 
 ## Screenshots or recordings
 
@@ -38,12 +42,17 @@ Closes #<!-- issue number -->
 
 ## Rollout notes
 
-<!-- Migrations, settings changes, packaging steps, or "None". -->
+<!-- Migrations, settings changes, packaging or release steps, or "None". -->
 
 ## Checklist
 
+<!-- The review checklist from docs/CONTRIBUTING.md. -->
+
 - [ ] Linked to an issue above
 - [ ] Scope is limited to that issue
-- [ ] Docs updated for user-visible changes
-- [ ] No new network calls, runtime dependencies, or third-party branding
+- [ ] New behavior has tests that check real output
+- [ ] Docs updated for anything users will notice
+- [ ] New interface text is in `t()`, and `npm run translations` lists nothing missing
+- [ ] Anything that still needs manual verification is listed above
+- [ ] No new network calls, dependencies, or third-party branding
 - [ ] Follow-up work is tracked in an issue