diff --git a/.github/ISSUE_TEMPLATE/bug_template.md b/.github/ISSUE_TEMPLATE/bug_template.md
index 63ae5e373a..04f8fd68d0 100644
--- a/.github/ISSUE_TEMPLATE/bug_template.md
+++ b/.github/ISSUE_TEMPLATE/bug_template.md
@@ -4,20 +4,17 @@ about: 'Create Bug Report'
 labels: bug
 ---
 
-<!--- Provide a general summary of the issue in the Title above -->
+<!---
+  Please use this template when reporting bugs. Thank you!
+-->
 
 ## Expected Behavior
 
 <!--- Tell us what should happen -->
 
-## Current Behavior
+## Actual Behavior
 
-<!--- Tell us what happens instead of the expected behavior -->
-
-## Possible Solution
-
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-<!--- or ideas as to the implementation of the addition or change -->
+<!--- Tell us what happens instead -->
 
 ## Steps to Reproduce
 
@@ -38,8 +35,10 @@ labels: bug
 
 <!--- Include as many relevant details about the environment you experienced the bug in -->
 
-<!-- ProTip: You can use `yarn backstage-cli info` command in your Backstage App for this section. -->
+- Browser Information: <!--- For example Google Chrome 97.0.4692.99 -->
 
-- NodeJS Version (v14):
-- Operating System and Version (e.g. Ubuntu 14.04):
-- Browser Information:
+- Output of `yarn backstage-cli info`: <!--- Paste into the code block below  -->
+
+```text
+
+```
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..e9f23287b7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,12 @@
+---
+blank_issues_enabled: false
+contact_links:
+  - about: 'Please ask and answer usage questions in GitHub Discussions'
+    name: Question
+    url: 'https://github.com/backstage/backstage/discussions'
+  - about: 'Alternatively, you can use the Backstage Community Discord'
+    name: Chat
+    url: 'https://discord.gg/MUpMjP2'
+  - about: 'Please check the FAQ before filing new issues'
+    name: 'Backstage FAQ'
+    url: 'https://backstage.io/docs/FAQ'