diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..6c21c23
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+## Describe the bug
+A clear and concise description of the bug.  
+
+## Steps to reproduce 
+Steps to reproduce the behavior:
+1.
+2.
+
+## Expected behavior
+A clear and concise description of what you expected to happen.
+
+## Environment (please complete the following information):
+ - Platform: [e.g. Cloud Foundry, Azure, etc.) 
+ - OS: [e.g. Windows, Linux, Mac OSX]
+ - .NET Version [e.g. .NET Core 2.1.0, .NET Framework 4.7.1, etc.] 
+ - Steeltoe Version [e.g. 2.3.0]
+ - Template type:
+ - Any other library versions to note
+
+## Screenshots
+If applicable, add screenshots to help explain your problem.
+
+## Additional context or links
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature-or-enhancement-request.md b/.github/ISSUE_TEMPLATE/feature-or-enhancement-request.md
new file mode 100644
index 0000000..c5e7476
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-or-enhancement-request.md
@@ -0,0 +1,20 @@
+---
+name: Feature or enhancement request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+## Is your feature request related to a problem? Please describe.
+A clear and concise description of what the problem you would like solved.
+
+## 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, code snippets, or examples of the feature here.