diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 0000000..1df76de
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,12 @@
+---
+name: Bug Report
+about: Any Ouch bug
+title: '_[BUG]_ '
+labels: bug
+assignees: ''
+
+---
+
+Thanks for filling a bug report!
+
+Don't forget to add the `ouch` version for which this error occurred.
diff --git a/.github/ISSUE_TEMPLATE/documentation-improvement.md b/.github/ISSUE_TEMPLATE/documentation-improvement.md
new file mode 100644
index 0000000..9c0e616
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation-improvement.md
@@ -0,0 +1,10 @@
+---
+name: Documentation Improvement
+about: Improvements in repository markdown or code docs
+title: '_[DOCS]_ '
+labels: documentation
+assignees: ''
+
+---
+
+