diff --git a/.github/ISSUE_TEMPLATE/issue.md b/.github/ISSUE_TEMPLATE/issue.md
new file mode 100644
index 0000000000000..106c4df8a40c0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue.md
@@ -0,0 +1,10 @@
+---
+name: Generic Issue
+about: For any type of issue or improvement
+---
+
+## Description
+[Describe the issue or task here]
+
+## Additional Information
+[Add any other relevant details]
diff --git a/.github/ISSUE_TEMPLATE/maintainence.md b/.github/ISSUE_TEMPLATE/maintainence.md
new file mode 100644
index 0000000000000..a7002c453c5cb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/maintainence.md
@@ -0,0 +1,14 @@
+---
+name: Maintenance Task
+about: For repository upkeep and improvements
+title: '[MAINTENANCE] '
+labels: Maintenance
+---
+
+[Briefly describe the maintenance task]
+
+## Proposed Changes
+[Outline the proposed changes or improvements]
+
+## Rationale
+[Explain why this maintenance is necessary]