diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..6e8bed8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,86 @@
+---
+name: Bug Report
+about: Report a defect in the app, API, or smart contracts
+title: '[BUG] '
+labels: bug
+assignees: ''
+---
+
+## Summary
+
+<!--
+One sentence: what broke and where.
+Example: "Submitting an entry on a reputation-gated giveaway returns 500 with PostgreSQL error 'invalid input syntax for type uuid'."
+-->
+
+## Steps to Reproduce
+
+1. ...
+2. ...
+3. ...
+
+## Expected Behavior
+
+<!--
+What you expected to happen.
+-->
+
+## Actual Behavior
+
+<!--
+What actually happened — include exact error messages, screenshots, or links.
+For on-chain bugs include the Soroban transaction hash and ledger sequence.
+-->
+
+## Environment
+
+<!--
+Delete rows that don't apply.
+
+- **Surface**: [web app / mobile-web / API / Soroban contract / indexer / cron]
+- **Wallet**: [Freighter v… / Lobstr / Stellar CLI / none]
+- **Network**: [testnet / public]
+- **Branch / commit SHA**: ...
+- **Browser**: [Chrome 124 / Safari 17 / Firefox …]
+- **OS**: [macOS 14 / Ubuntu 22.04 / iOS 17]
+- **Auth method**: [Freighter / legacy email / dev mock user]
+- **Wallet address** (if safe to share): G…
+-->
+
+## Logs / Artifacts
+
+<!--
+Paste console logs, server logs, Prisma query outputs, Soroban event payloads,
+or screenshots / screen recordings. Use fenced code blocks.
+REMOVE / REDACT: wallet private keys, JWT secrets, signers, seed phrases.
+-->
+
+## Related Issues / PRs
+
+<!--
+- Closes #
+- Related to #
+- E.g. reproducing on PR #XYZ
+-->
+
+## Severity
+
+<!--
+🟢 Low      — cosmetic, edge case, workaround exists
+🟡 Medium   — broken feature with workaround
+🟠 High     — broken feature, no workaround
+🔴 Critical — loss of funds, security exposure, data loss, or app outage
+-->
+
+## Possible Cause (optional)
+
+<!--
+If you have a hunch (e.g. "race condition in select-winners"), share your reasoning —
+no fix is required in the bug report itself.
+-->
+
+## Reproduction Checklist
+
+- [ ] I searched existing issues and confirmed this is not a duplicate
+- [ ] I can reproduce this bug at will
+- [ ] I have redacted all secrets / private keys from logs before submitting
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index f726f02..e65ce75 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,39 +1,66 @@
-# Pull Request Template
+## Summary
 
-## Description
+<!--
+Briefly describe what this PR does and *why*.
+Keep it short — reviewers should understand the intent in one minute.
+-->
 
-Please include a summary of the change and which issue is fixed. Also include relevant motivation and context.
+## Related Issues
 
----
+<!--
+Link any issues this PR closes, fixes, or relates to.
+
+- Closes #
+- Fixes #
+- Related to #
+-->
+
+## Changes
+
+<!--
+List the user-visible or notable technical changes made in this PR.
+Group by area (frontend, backend, contracts, docs) when it helps clarity.
+
+- ...
+- ...
+-->
+
+## Test Plan / Verification
+
+<!--
+How was this change validated? Include:
+
+- Unit / integration tests added or updated
+- Manual QA steps
+- On-chain / Stellar testnet transaction hashes (if applicable)
+
+-->
+
+## Screenshots / Recordings
+
+<!--
+For UI changes, attach before/after screenshots or short screen recordings.
+Delete this section if not applicable.
+-->
 
 ## Checklist
-- [ ] I have tested my changes locally
-- [ ] I have updated documentation as needed
-- [ ] I have run `npx prisma generate` after schema changes
-- [ ] I have run `npx prisma migrate dev` or `npx prisma migrate deploy` as appropriate
-
----
-
-## Post-Merge Steps for Maintainers
-
-**If this PR includes changes to the Prisma schema:**
-
-1. Run the following command to apply the migration to your database:
-   
-   ```sh
-   npx prisma migrate deploy
-   ```
-   or, for local development:
-   ```sh
-   npx prisma migrate dev
-   ```
-2. Ensure your CI pipeline runs the migration before tests (add this step if missing):
-   ```yaml
-   - name: Run Prisma Migrate
-     run: npx prisma migrate deploy
-   ```
-3. Make sure the database user in CI has permission to run migrations.
-
----
-
-If you have any questions, please comment on this PR.
+
+- [ ] PR title follows Conventional Commits (e.g. `feat(frontend): …`, `fix: …`, `chore: …`, `docs: …`)
+- [ ] Changeset added at repo root (`pnpm changeset`) for any user-facing change — packages are bucketed automatically in this monorepo
+- [ ] Tests added or updated for behavior changes
+- [ ] Docs updated (if behavior is user-facing)
+- [ ] No new warnings from `pnpm lint` / `cargo clippy`
+- [ ] If backwards-incompatible, the **Breaking Changes** section below is filled in
+
+## Breaking Changes
+
+<!--
+Describe any breaking or migration-impacting changes.
+If none, write "None".
+-->
+
+## Notes for Reviewers
+
+<!--
+Anything reviewers should focus on, known limitations, or follow-ups.
+-->