diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..2d12843
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,37 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[Bug]"
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. step 1
+1. step 2
+1. step 3...
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Complementary information**
+If applicable, add screenshots and any additional information that might help explain your problem.
+
+**Work environment**
+ - Client OS: 
+- Server OS:
+ - Browse type and version:
+- Cortex version:
+ - Cortex Analyzer/Responder name:
+- Cortex Analyzer/Responder version:
+
+**Possible solutions**
+If applicable, indicate possible solutions to the problem.
+
+**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 0000000..f32df88
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FR]"
+labels: feature request
+assignees: ''
+
+---
+
+**Feature description**
+A clear and concise description of your feature request.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.