diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 000000000..b66c1bd91
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,65 @@
+---
+name: Bug report
+about: Create a new bug report to help us improve Octopost
+title: ''
+labels: ''
+assignees: ''
+---
+
+**Describe the bug**
+A short description of what the bug is.
+
+
+
+ Description
+
+ [Describe the bug reported]
+
+
+
+
+
+
+ Steps to Reproduce
+
+
+[If applicable, provide detailed steps to reproduce the bug.]
+
+
+
+
+
+
+
+ Expected Behavior
+
+ [Describe what is expected to happen.]
+
+
+
+
+
+
+ Current Behavior
+
+ [Describe what is currently happening.]
+
+
+
+
+
+
+ Visual information
+
+ [If possible, add screenshots to illustrate this bug.]
+
+
+
+
+
+
+ Additional Information
+
+ [Provide any additional information, such as relevant versions, browser, OS, context, etc.]
+
+
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 000000000..9b7a4b369
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,58 @@
+---
+name: Feature request
+about: Suggest a feature to be added to Octopost
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the feature**
+A clear and short description of the feature.
+
+
+
+ Description
+
+ [Describe the new feature requested.]
+
+
+
+
+
+
+ Use Case
+
+
+[Explain the use for this feature and how it might benefits the project.]
+
+
+
+
+
+
+ Implementation Details
+
+
+[Provide any details or suggestions on how this feature could be implemented.]
+
+
+
+
+
+
+ Visual Concepts
+
+
+[Include any visual representations or concepts if those are available and applicable.]
+
+
+
+
+
+
+ Additional Information
+
+
+[Provide any additional information, such as context that might be relevant to the implementation of this specific feature.]
+
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/issue_template.md b/.github/ISSUE_TEMPLATE/issue_template.md
index 254c4a9dd..b66c1bd91 100644
--- a/.github/ISSUE_TEMPLATE/issue_template.md
+++ b/.github/ISSUE_TEMPLATE/issue_template.md
@@ -1,22 +1,19 @@
---
-name: Issue
-about: Create a new issue to help us improve Octopost
+name: Bug report
+about: Create a new bug report to help us improve Octopost
title: ''
-labels: needs triage
+labels: ''
assignees: ''
---
-## [Issue Title]
-
-_label: [tag1, tag2]
-
-assignees: [assignee_username]_
+**Describe the bug**
+A short description of what the bug is.
Description
- [Describe the issue or feature requested]
+ [Describe the bug reported]
@@ -26,7 +23,7 @@ assignees: [assignee_username]_
Steps to Reproduce
-[If applicable, provide detailed steps to reproduce the issue.]
+[If applicable, provide detailed steps to reproduce the bug.]
@@ -36,7 +33,7 @@ assignees: [assignee_username]_
Expected Behavior
- [Describe what you expect to happen.]
+ [Describe what is expected to happen.]
@@ -54,7 +51,7 @@ assignees: [assignee_username]_
Visual information
- [If possible, add screenshots to illustrate the issue.]
+ [If possible, add screenshots to illustrate this bug.]
@@ -63,6 +60,6 @@ assignees: [assignee_username]_
Additional Information
- [Provide any additional information, such as relevant versions, context, etc.]
+ [Provide any additional information, such as relevant versions, browser, OS, context, etc.]