diff --git a/.github/ISSUE_TEMPLATE/general-issue.md b/.github/ISSUE_TEMPLATE/general-issue.md
new file mode 100644
index 00000000..19f8d123
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/general-issue.md
@@ -0,0 +1,24 @@
+---
+name: General Issue
+about: Use this template for reporting issues that don't fit into bug reports or feature requests.
+title: "[General Issue] - "
+labels: "question, discussion"
+assignees: ""
+---
+
+## General Issue
+
+### Description
+<!-- Provide a detailed description of the issue or question. -->
+
+### Expected Behavior
+<!-- Describe what behavior you expected to observe. -->
+
+### Actual Behavior
+<!-- Describe what behavior you observed instead. -->
+
+### Steps to Reproduce
+<!-- If applicable, list the steps to reproduce the issue. -->
+
+### Additional Information
+<!-- Include any other details, logs, screenshots, etc., that might be useful for understanding the issue. -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..483b69dc
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,33 @@
+## Pull Request Template
+
+### Description
+<!-- Please provide a description of the changes being made and why they are necessary. -->
+
+- **What changes are being made?**
+  - 
+
+- **Why are these changes necessary?**
+  - 
+
+- **Which issues or tickets does this PR close or relate to?**
+  - Related issue: #
+
+### Type of Change
+<!-- Please check the type of change that applies to your PR. -->
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+- [ ] Documentation update
+- [ ] Other (please specify):
+
+### Checklist
+- [ ] Code has been linted.
+- [ ] Documentation has been updated (if needed).
+- [ ] Tests have been added or updated (if needed).
+- [ ] Any breaking changes have been communicated to the team.
+
+### Screenshots or Recordings (if applicable)
+<!-- Add screenshots, videos, or recordings that might help in understanding the changes better. -->
+
+### Additional Information
+<!-- Any additional information or context that might be useful during review. -->