diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..88fad56c9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Report a bug or unexpected treasuremap behavior
+title: ''
+labels: bug, triage
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+If known add a label for the type of issue, i.e affecting the Documents vs its a CI/CD problem.
+
+**Steps To Reproduce**
+Minimal steps to reproduce the issue.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Environment**
+- airshipctl Version:
+- Treasuremp site type :
+- Operating System:
+- Kernel version:
+- Kubernetes Version:
+- Go version:
+- Hardware specs (e.g. 4 vCPUs, 16GB RAM, bare metal vs VM):
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..569b65555
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,18 @@
+---
+name: Feature request
+about: Suggest a treasuremp feature
+title: ''
+labels: enhancement, triage
+assignees: ''
+
+---
+
+**Problem description (if applicable)**
+A description of the problem or background information that illustrates the need
+for a new feature.
+
+**Proposed change**
+A detailed description of the new, requested behavior.
+
+**Potential impacts**
+Potential security or performance related impacts.