diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..647c2d0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,41 @@
+---
+name: Bug Report
+about: Report something that isn't working as expected
+title: 'bug: '
+labels: type:bug
+---
+
+## Describe the Bug
+
+<!-- A clear description of what the bug is. -->
+
+## Steps to Reproduce
+
+1.
+2.
+3.
+
+## Expected Behavior
+
+<!-- What you expected to happen. -->
+
+## Actual Behavior
+
+<!-- What actually happened. -->
+
+## Environment
+
+- OCPP DebugKit version:
+- Node.js version:
+- OS:
+- Browser (if applicable):
+
+## Trace / Input
+
+<!-- If applicable, paste a minimal trace or input that triggers the bug.
+     Do NOT include real station IDs, transaction IDs, or sensitive data —
+     use anonymized/synthetic data. -->
+
+```
+(paste here)
+```
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..939eeea
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,26 @@
+---
+name: Feature Request
+about: Suggest a new feature or enhancement
+title: 'feat: '
+labels: type:feature
+---
+
+## Feature Description
+
+<!-- A clear description of the feature you'd like to see. -->
+
+## Problem / Motivation
+
+<!-- What problem does this feature solve? Why is it needed? -->
+
+## Proposed Solution
+
+<!-- How do you envision this working? -->
+
+## Alternatives Considered
+
+<!-- Any alternative solutions or features you've considered. -->
+
+## Additional Context
+
+<!-- Anything else relevant (screenshots, links, examples, etc.) -->
diff --git a/.github/ISSUE_TEMPLATE/scenario_request.md b/.github/ISSUE_TEMPLATE/scenario_request.md
new file mode 100644
index 0000000..d93a160
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/scenario_request.md
@@ -0,0 +1,33 @@
+---
+name: Scenario Request
+about: Propose a new OCPP trace scenario for the scenario evaluator
+title: 'scenario: '
+labels: type:feature,package:scenarios
+---
+
+## Scenario Name
+
+<!-- A short, descriptive name for the scenario (e.g., "Failed Authorization") -->
+
+## Description
+
+<!-- What OCPP session pattern does this scenario represent? What should it detect? -->
+
+## Expected Failures
+
+<!-- Which failure rules should this scenario trigger? (e.g., FAILED_AUTHORIZATION, CONNECTOR_FAULT) -->
+
+## Trace Events
+
+<!-- Describe the key events in the scenario:
+- Message types and directions (CS→CSMS or CSMS→CS)
+- Expected sequence
+- What goes wrong -->
+
+## OCPP Version
+
+<!-- Which OCPP version? (1.6 JSON, 2.0.1, etc.) -->
+
+## Additional Context
+
+<!-- Any relevant details about the session, station, or connector behavior -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..99b09b9
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,32 @@
+## Summary
+
+<!-- Brief description of what this PR does and why -->
+
+## Related Issue
+
+<!-- Link to the issue this PR addresses. Use "Closes #N" to auto-close on merge. -->
+
+Closes #
+
+## Changes
+
+<!-- List the key changes in this PR -->
+
+-
+
+## Checklist
+
+- [ ] Tests added or updated for the behavior this PR introduces
+- [ ] Lint passes (`pnpm lint`)
+- [ ] Typecheck passes (`pnpm typecheck`)
+- [ ] Tests pass (`pnpm test`)
+- [ ] Build passes (`pnpm build`)
+- [ ] Changeset added (if changing publishable package behavior)
+- [ ] `CURRENT_STATE.md` updated (if applicable)
+- [ ] `AGENTS.md` updated (if architecture or build commands changed)
+- [ ] No secrets or sensitive data in committed artifacts
+- [ ] Untrusted-input handling reviewed (if touching parsing, CLI, or UI)
+
+## Notes for Reviewer
+
+<!-- Anything the reviewer should pay attention to -->
diff --git a/CURRENT_STATE.md b/CURRENT_STATE.md
index afa83ab..064d009 100644
--- a/CURRENT_STATE.md
+++ b/CURRENT_STATE.md
@@ -37,11 +37,16 @@ feature code lands.
 - ✅ `.github/workflows/release.yml` — Changesets version PR, npm publish, ecosystem tag + GitHub release
 - ✅ `.changeset/config.json` — public access, base branch main
 
-## What's Next
+### GitHub Templates (in progress — this PR)
+- ✅ `.github/PULL_REQUEST_TEMPLATE.md`
+- ✅ `.github/ISSUE_TEMPLATE/bug_report.md`
+- ✅ `.github/ISSUE_TEMPLATE/feature_request.md`
+- ✅ `.github/ISSUE_TEMPLATE/scenario_request.md`
 
-1. **PR3** (Issues #7–#8): PR template + issue templates
-2. **PR4** (Issues #9–#11): CONTRIBUTING, CODE_OF_CONDUCT, ROADMAP, README
-3. **M0 complete** → proceed to M0.5 (Protocol & Trace-Format Design Phase)
+
+
+1. **PR4** (Issues #9–#11): CONTRIBUTING, CODE_OF_CONDUCT, ROADMAP, README
+2. **M0 complete** → proceed to M0.5 (Protocol & Trace-Format Design Phase)
 
 ## Known Blockers / Decisions Pending