diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..553341eb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+This issue tracker is only for issues related to Frappe-Manager. Please use https://github.com/rtcamp/frappe-manager/discussions for support questions.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Run command '...'
+2. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**System information (please complete the following information):**
+- [ ] `fm --version`
+- [ ] `lsb_release -a`
+- [ ] `docker version`
+- [ ] `docker-compose version` or `docker compose version`
+
+**Attach log**
+Please attach logs from `~/frappe/logs/fm.log` for faster resolution.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..60ffd102
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,29 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Description**
+[Describe the feature you are requesting. Be as detailed as possible about what you would like to see added or improved in the project.]
+
+**Use Case**
+[Explain the specific use cases or scenarios where this feature would be beneficial or necessary.]
+
+**Expected Behavior**
+[Describe the expected behavior or outcome if this feature were implemented.]
+
+**Current Behavior (if applicable)**
+[Explain the current behavior or limitations of the project related to this feature request, if applicable.]
+
+**Possible Solution**
+[If you have any ideas or suggestions on how this feature could be implemented, please share them here.]
+
+**Additional Context**
+[Provide any additional context, information, or examples that might be helpful in understanding or implementing this feature.]
+
+**Related Issues/Pull Requests**
+[If applicable, list any related issues or pull requests that might be relevant to this feature request.]