diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000000000000000000000000000000000..04af2ae0775f170a9e92aec22b1ae78ac4edc9cd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,54 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: '[BUG] '
+labels: 'bug'
+assignees: ''
+
+---
+
+<!--
+Notes:
+1. Only post _bug reports_ here.
+2. Use the appropriate template for _feature requests_.
+3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode.
+-->
+
+#### Describe the bug
+<!-- A clear and concise description of what the bug is. -->
+
+
+
+#### Setup
+<!-- Provide links to the SLS files and/or relevant configs (be sure to remove sensitive info). -->
+
+
+
+#### Steps to reproduce the bug
+<!-- Include debug logs if possible and relevant, e.g. using `salt-minion -l debug`. -->
+<!-- Alternatively, linking to Kitchen debug logs is useful, e.g. via. Travis CI. -->
+<!-- Most useful is providing a failing InSpec test, which can be used to verify any proposed fix. -->
+
+
+
+#### Expected behaviour
+<!-- A clear and concise description of what you expected to happen. -->
+
+
+
+#### Versions report
+<!-- Provided by running `salt --versions-report`. Please also mention any differences in master/minion versions. -->
+
+
+
+#### Additional context
+<!-- Add any other context about the problem here. -->
+
+
+
+---
+
+#### Optional: How can this template be improved?
+<!-- Feel free to suggest how this template can be improved. -->
+
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000000000000000000000000000000000..ae0b7738ecdfb28c86651054a71804594844dbfb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,42 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: '[FEATURE] '
+labels: 'enhancement'
+assignees: ''
+
+---
+
+<!--
+Notes:
+1. Only post _feature requests_ here.
+2. Use the appropriate template for _bug reports_.
+3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode.
+-->
+
+#### Is your feature request related to a problem?
+<!-- A clear and concise description of what the problem is. -->
+
+
+
+#### Describe the solution you'd like
+<!-- A clear and concise description of what you want to happen. -->
+
+
+
+#### Describe alternatives you've considered
+<!-- Describe any alternative solutions or features you've considered. -->
+
+
+
+#### Additional context
+<!-- Add any other context about the feature request here. -->
+
+
+
+---
+
+#### Optional: How can this template be improved?
+<!-- Feel free to suggest how this template can be improved. -->
+
+