diff --git a/.github/ISSUE_TEMPLATE/faq-and-troubleshooting-sources.md b/.github/ISSUE_TEMPLATE/faq-and-troubleshooting-sources.md
deleted file mode 100644
index 4fc592a9..00000000
--- a/.github/ISSUE_TEMPLATE/faq-and-troubleshooting-sources.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-name: FAQ and Troubleshooting sources
-about: This template provides links to the FAQ and Troubleshooting materials.
-title: ''
-labels: ''
-assignees: ''
-
----
-
-# Troubleshooting
-1. https://developer.fermyon.com/spin/rust-components#troubleshooting
-
-# FAQ
-1. https://developer.fermyon.com/cloud/faq
-2. https://developer.fermyon.com/spin/build#setting-up-for-spin-build
diff --git a/.github/ISSUE_TEMPLATE/report-bug-or-problem.md b/.github/ISSUE_TEMPLATE/report-bug-or-problem.md
new file mode 100644
index 00000000..450a551c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/report-bug-or-problem.md
@@ -0,0 +1,19 @@
+---
+name: Report a bug or problem
+about: Let us know about something that isn't working as you expect, or ask about a problem
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Do any of the following links help with your problem?
+
+[Application Prerequisites](https://developer.fermyon.com/spin/build#setting-up-for-spin-build)
+[Troubleshooting - Rust](https://developer.fermyon.com/spin/rust-components#troubleshooting)
+[Cloud FAQ](https://developer.fermyon.com/cloud/faq)
+
+If you still see a bug or problem, please let us know:
+
+* Spin version (`spin --version`)
+* Installed plugin versions (`spin plugins list --installed`)
diff --git a/.github/ISSUE_TEMPLATE/suggestion.md b/.github/ISSUE_TEMPLATE/suggestion.md
new file mode 100644
index 00000000..d5669958
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/suggestion.md
@@ -0,0 +1,9 @@
+---
+name: Share a suggestion
+about: Suggest an improvement, new feature, or something we could do better
+title: ''
+labels: ''
+assignees: ''
+
+---
+