diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index c91804c41..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
- This is the place to report a bug, ask a question, or suggest an enhancement.
-
- This is also the place to make a discussion before creating a PR.
-
- If this is a bug report, please provide a test case and the error output. Useful information:
- - your orchestrator.conf.json config file/contents
- - your topology (e.g. run `orchestrator-client -c topology -alias my-cluster`)
- - what did you do?
- - what did you expect to happen?
- - what happened?
- - orchestrator logs; please use `--debug --stack` for maximum verbosity
-
- Please use markdown to format code or SQL: https://guides.github.com/features/mastering-markdown/
-
- And please understand that this issue may not be addressed immediately or in a timeframe you were expecting.
-
- Thank you!
--->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..2135d83fe
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,57 @@
+---
+name: Bug Report
+about: Report a bug
+labels: bug
+---
+
+## Bug Report
+
+### Orchestrator version
+
+<!-- Output of `orchestrator --version` -->
+
+### Backend
+
+<!-- MySQL or SQLite? -->
+
+### Configuration
+
+<!-- Paste your orchestrator.conf.json below (sanitized — remove passwords and sensitive hostnames) -->
+
+```json
+
+```
+
+### Topology
+
+<!-- Paste the output of `orchestrator-client -c topology -alias my-cluster` -->
+
+```
+
+```
+
+### Steps to reproduce
+
+1.
+2.
+3.
+
+### Expected behavior
+
+<!-- What did you expect to happen? -->
+
+### Actual behavior
+
+<!-- What happened instead? -->
+
+### Logs
+
+<!-- Please include relevant orchestrator logs. Use `--debug --stack` for maximum verbosity. -->
+
+```
+
+```
+
+### Additional context
+
+<!-- Any other information that might be helpful (OS, MySQL version, raft/non-raft mode, etc.) -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..561843656
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,23 @@
+---
+name: Feature Request
+about: Suggest a new feature
+labels: enhancement
+---
+
+## Feature Request
+
+### Problem description / use case
+
+<!-- What problem are you trying to solve? Why is this feature needed? -->
+
+### Proposed solution
+
+<!-- How do you envision this feature working? -->
+
+### Alternatives considered
+
+<!-- Have you considered any alternative solutions or workarounds? -->
+
+### Additional context
+
+<!-- Any other information, mockups, or references that might be helpful. -->
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 000000000..8835c83ac
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,11 @@
+---
+name: Question
+about: Ask a question about orchestrator
+labels: question
+---
+
+## Question
+
+<!-- Please check the documentation first: https://github.com/proxysql/orchestrator/tree/master/docs -->
+
+<!-- Ask your question below. Include as much context as possible (version, setup, what you've tried). -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 978d97286..a1aabc92e 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,31 +1,17 @@
-<!--
-## A Pull Request should be associated with an Issue.
-
-> We wish to have discussions in Issues. A single issue may be targeted by multiple PRs.
-> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
-> and potentially we'll be able to point development in a particular direction.
-Thank you! We are open to PRs, but please understand if for technical reasons we are unable to accept each and any PR
--->
-
-Related issue: https://github.com/openark/orchestrator/issues/0123456789
+## Pull Request
 
+Related issue: https://github.com/proxysql/orchestrator/issues/
 
 ### Description
 
-This PR [briefly explain what is does]
-
-<!--
-Please make sure that:
+This PR [briefly explain what it does]
 
-- [ ] contributed code is using same conventions as original code
+### Checklist
 
-Please make sure the PR passes CI tests. For your information, CI tests the following:
+Please review the [contribution guidelines](CONTRIBUTING.md) before submitting.
 
-- code is formatted via `gofmt` (please avoid `goimports`)
-- code passes compilation
-- code passes unit tests
-- code passes integration tests with MySQL backend
-- code passes integration tests with SQLite backend
-- There are no orphaned docs/ pages (there's some link in the docs to point to any page)
-- upgrade from previous version (`master` branch) is successful
- -->
+- [ ] Code formatted with `gofmt` (please avoid `goimports`)
+- [ ] Tests added/updated
+- [ ] CI passes (unit, integration, system tests)
+- [ ] DCO sign-off included (`git commit -s`)
+- [ ] Related issue linked above