diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index d4093fe4..0a3cc5e7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,52 +1,45 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Create a report to help the card improve
 title: ''
 labels: bug
 assignees: ''
 ---
 
-<!-- READ THIS FIRST:
-- If you need additional help with this template please refer to https://www.home-assistant.io/help/reporting_issues/
-- Make sure you are running the latest version of Home Assistant before reporting an issue: https://github.com/home-assistant/home-assistant/releases
-- Provide as many details as possible. Do not delete any text from this template!
--->
+<!-- ====================================================================== -->
+<!-- ***               PLEASE DO NOT IGNORE THIS TEMPLATE               *** -->
+<!-- ***                                                                *** -->
+<!-- *** This is the smallest amount of information needed to help you! ***  -->
+<!-- ====================================================================== -->
 
 **Checklist:**
 
-- [ ] I updated to the latest version available
-- [ ] I cleared the cache of my browser
-
-**Release with the issue:**
-
-**Last working release (if known):**
+- Please try updating to the [latest available version](https://github.com/dermotduffy/frigate-hass-card/releases).
+- Please try clearing your browser cache.
 
-**Browser and Operating System:**
+**[REQUIRED] Card diagnostic information:**
 
 <!--
-Provide details about what browser (and version) you are seeing the issue in. And also which operating system this is on. If possible try to replicate the issue in other browsers and include your findings here.
+On the card, hold down the Default/Frigate menu button for a few seconds then paste the diagnostics below. No help can be provided without this
 -->
 
-**Description of problem:**
+```yaml
 
-<!--
-Explain what the issue is, and how things should look/behave. If possible provide a screenshot with a description.
--->
+```
 
-**Frigate card diagnostic information**
+**[REQUIRED] Description of problem:**
 
 <!--
-On the card, hold down the Frigate menu button for a few seconds then paste the diagnostics below:
+Explain what the issue is, and how things should look/behave. If possible provide a screenshot with a description.
 -->
 
-```yaml
+**[OPTIONAL] Last working release (if known):**
 
-```
 
-**Javascript errors shown in the web inspector (if applicable):**
+**[OPTIONAL] Javascript errors shown in the web inspector:**
 
-```
+```text
 
 ```
 
-**Additional information:**
+**[OPTIONAL] Additional information:**
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 22b00af0..730c21ea 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -6,14 +6,14 @@ labels: feature request
 assignees: ''
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+**[REQUIRED] Describe the feature you'd like:**
 
-**Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 
-**Describe alternatives you've considered**
+**[OPTIONAL] Describe alternatives you've considered:**
+
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**
+**[OPTIONAL] Additional context:**
+
 Add any other context or screenshots about the feature request here.