3 files changed, 50 insertions, 0 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..2dd250cb65
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,25 @@
+---
+name: Bug report
+about: Create a report
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Environment**
+What OpenBMC platform was this found on?
+What specific OpenBMC versions did you use?
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Run the command '....'
+2. See error
+3. Expected behavior was '....'
+
+**Is this a regression**
+Has this behavior worked in the past?  If yes, on which commit did it work, and
+what commit was broken?
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
new file mode 100644
index 0000000000..2ac057672c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/custom.md
@@ -0,0 +1,13 @@
+---
+name: Custom issue template
+about: Question
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Please do not use GitHub issues for submitting questions.  Please submit your
+questions either to the OpenBMC mailing list, or to the OpenBMC discord channel.
+
+https://github.com/openbmc/docs/blob/master/README.md#contact
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..6c77cefdf3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,12 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Please do not submit feature requests to GitHub.  Please indicate your interest
+in particular projects or features on the mailing list at
+https://lists.ozlabs.org/listinfo/openbmc