diff --git a/.github/ISSUE_TEMPLATE/1_Bug_report.yaml b/.github/ISSUE_TEMPLATE/1_Bug_report.yaml
new file mode 100644
index 000000000..1d8ea9513
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1_Bug_report.yaml
@@ -0,0 +1,26 @@
+name: Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels: ["bug"]
+
+body:
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version are you running?
+      placeholder: x.y.z
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A clear and concise description of the problem
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Any other context about the bug (configs, logs, screenshots etc.)
diff --git a/.github/ISSUE_TEMPLATE/2_Question.yaml b/.github/ISSUE_TEMPLATE/2_Question.yaml
new file mode 100644
index 000000000..5fdeb750e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2_Question.yaml
@@ -0,0 +1,26 @@
+name: Question
+description: Ask a question
+title: "[Question]: "
+labels: ["question"]
+
+body:
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version are you running?
+      placeholder: x.y.z
+    validations:
+      required: true
+  - type: textarea
+    id: question
+    attributes:
+      label: Question
+      description: Please tell us about your question or problem
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Any other context (configs, logs, screenshots etc.)
diff --git a/.github/ISSUE_TEMPLATE/3_Feature_request.yaml b/.github/ISSUE_TEMPLATE/3_Feature_request.yaml
new file mode 100644
index 000000000..971413daf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3_Feature_request.yaml
@@ -0,0 +1,18 @@
+name: Feature Request
+description: Suggest ideas for new features and improvements
+title: "[Feature]: "
+labels: ["enhancement"]
+
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A clear and concise description of the feature
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Any other context about the feature request (e.g. screenshots, code snippets, etc.)
diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
new file mode 100644
index 000000000..0086358db
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -0,0 +1 @@
+blank_issues_enabled: true
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000000000..17e105bbf
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,15 @@
+| Q             | A                                                                                                                         |
+|---------------|---------------------------------------------------------------------------------------------------------------------------|
+| Bug fix?      | yes/no                                                                                                                    |
+| New feature?  | yes/no <!-- please update src/**/CHANGELOG.md files -->                                                                   |
+| Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->                                                  |
+| Issues        | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exists, explain below instead --> |
+
+<!--
+Replace this notice by a description of your feature/bugfix.
+This will help reviewers and should be a good start for the documentation.
+
+Additionally:
+ - Always add tests and ensure they pass.
+ - For new features, provide some code snippets to help understand usage.
+-->