diff --git a/.github/ISSUE_TEMPLATE/found-a-bug.md b/.github/ISSUE_TEMPLATE/found-a-bug.md
new file mode 100644
index 0000000..e995f81
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/found-a-bug.md
@@ -0,0 +1,21 @@
+---
+name: Found a bug?
+about: Use this template if you found a bug
+title: ""
+labels: ""
+assignees: ""
+---
+
+<!-- Please use PeerTube or YouTube comments for questions and issues for bug reports. -->
+
+## Guide
+
+<!-- Example: How to self-host a hardened strongSwan IKEv2/IPsec VPN server for iOS and macOS -->
+
+## Operating system and version
+
+<!-- Example: macOS Catalina 10.15.7 -->
+
+## Description
+
+What isn’t working?
diff --git a/.github/ISSUE_TEMPLATE/have-a-recommendation-.md b/.github/ISSUE_TEMPLATE/have-a-recommendation-.md
deleted file mode 100644
index 0f45b19..0000000
--- a/.github/ISSUE_TEMPLATE/have-a-recommendation-.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: Have a recommendation?
-about: Use this template if you have a recommendation
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Title:** title of guide
-**Branch:** master or draft?
-
-What do you recommend?
diff --git a/.github/ISSUE_TEMPLATE/have-a-recommendation.md b/.github/ISSUE_TEMPLATE/have-a-recommendation.md
new file mode 100644
index 0000000..24bfde2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/have-a-recommendation.md
@@ -0,0 +1,24 @@
+---
+name: Have a recommendation?
+about: Use this template if you have a recommendation
+title: ""
+labels: ""
+assignees: ""
+---
+
+## Branch
+
+- [ ] master
+- [ ] draft
+
+## Guide
+
+<!-- Example: How to self-host a hardened strongSwan IKEv2/IPsec VPN server for iOS and macOS -->
+
+## Operating system and version
+
+<!-- Example: macOS Catalina 10.15.7 -->
+
+## Description
+
+What do you recommend?
diff --git a/.github/ISSUE_TEMPLATE/need-help-.md b/.github/ISSUE_TEMPLATE/need-help-.md
deleted file mode 100644
index 504e4a0..0000000
--- a/.github/ISSUE_TEMPLATE/need-help-.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-name: Need help?
-about: Use this template if you need help
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Please use comments on YouTube or PeerTube when possible as others may be able to help (two brains are better than one).**
-
-**Title:** Title of guide
-**Branch:** master or draft?
-
-What isn’t working?