diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index fa55bd2..0000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,30 +0,0 @@
-## Summary
-
-Give a brief description of the problem.
-
-### Details
-
-Explain with further technical details, if applies.
-
-### Impact
-
-Why is it important?
-
-## How to reproduce?
-
-### Environment
-- Helm chart version:
-- Graylog version:
-- Kubernetes version:
-- Cloud provider / platform:
-
-### Pre-flight checks
-- [ ] `helm lint ./graylog` passes
-- [ ] Checked existing issues for duplicates
-
-### Steps
-1. ...
-2. ...
-
-## Notes for maintainers
-_Any additional context, logs, or screenshots_
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..8c4d602
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Summary
+_Give a brief description of the problem._
+
+### Details
+_Explain with further technical details, if applicable._
+
+### Impact
+_What is affected by this issue, and why does it matter?_
+
+## How to Reproduce?
+
+## Environment
+
+- Helm chart version:
+- Graylog version:
+- Kubernetes version:
+- Cloud provider / platform:
+
+### Pre-flight checks
+- [ ] `helm lint ./graylog` passes
+- [ ] Checked existing issues for duplicates
+
+### Steps to reproduce the issue:
+1. ...
+2. ...
+
+**Expected behavior**
+_A clear and concise description of what you expected to happen._
+
+## Notes for maintainers
+_Any additional context, logs, or screenshots_
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..bbcbbe7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.