diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
new file mode 100644
index 000000000..05e01b840
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -0,0 +1,36 @@
+---
+name: Bug
+about: Create a report to help us improve
+labels: bug
+---
+
+### Description:
+
+<!-- A clear and concise description of what the bug is. -->
+
+### Steps to reproduce:
+
+1. <!-- Go to '...' -->
+2. <!-- Click on '....' -->
+3. <!-- and so on... -->
+
+### Expected behavior:
+
+<!-- What you expect to happen -->
+
+### Actual behavior:
+
+<!-- What actually happens with SCREENSHOT, if applicable -->
+
+### Server Setup Information:
+
+<!-- Feel Free to Remove this section if you are a user and don't have the exact server details -->
+<!-- Additional Information which may be useful. Add whatever information is available, skip the field which are not available-->
+
+- Operating System: 
+- Deployment Method: <!-- snap/docker/tar/etc -->
+
+
+### Additional context
+
+<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
new file mode 100644
index 000000000..fc8cd1aaa
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -0,0 +1,23 @@
+---
+name: Feature
+about: Create a feature request
+labels: enhancement
+---
+
+
+## Why do we need this ?
+
+<!-- A clear and concise description of what is the feature and why you need it ? -->
+
+## Acceptance Criteria
+
+<!-- Add Acceptance Criteria to merge a pull request to add this feature. -->
+
+- [ ] TODO 1
+- [ ] TODO 2
+- [ ] TODO 3
+
+## Further Comments / References  
+
+<!-- Any additional comments for this . -->
+<!-- Add References to similar features provided by any other platform(if possible)  -->
\ No newline at end of file