diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..7113e36c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a bug report on the CLI. Do not submit suggestions for patches here.
+title: 'problem: some problem'
+labels: bug
+assignees: TheJeterLP, oSumAtrIX, Sculas, epicsampler
+
+---
+
+# 🐞 Issue
+
+<!-- Describe your issue in detail here -->
+
+# ⚙ Reproduce
+
+<!-- Include your environment and steps to reproduce the issue as detailed as possible -->
+
+# 🛠 Solution
+
+<!-- If applicable, add a possible solution -->
+
+# ⚠ 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 00000000..e11b4187
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest a change to the CLI. Do not submit suggestions for patches here.
+title: 'feat: some feature'
+labels: bug
+assignees: TheJeterLP, oSumAtrIX, Sculas, epicsampler
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.