diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 96efcfaad8..705a5fc55b 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1 @@
-Please fill out one of the templates on: https://github.com/Homebrew/homebrew-core/issues/new/choose
-
-To get formulae added or changed in Homebrew please file a [Pull Request](https://github.com/Homebrew/homebrew-core/blob/master/CONTRIBUTING.md)
-
-If you want to ask a question please do so on our Discourse: https://discourse.brew.sh
-
-We will close issues asking questions or requesting formulae changes without comment.
\ No newline at end of file
+# Please fill out one of the templates on: https://github.com/Homebrew/homebrew-core/issues/new/choose or we will close it without comment.
diff --git a/.github/ISSUE_TEMPLATE/Reproducible-Bug-Report.md b/.github/ISSUE_TEMPLATE/bug.md
similarity index 53%
rename from .github/ISSUE_TEMPLATE/Reproducible-Bug-Report.md
rename to .github/ISSUE_TEMPLATE/bug.md
index 43e551adf4..79f3fbf379 100644
--- a/.github/ISSUE_TEMPLATE/Reproducible-Bug-Report.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -1,19 +1,39 @@
 ---
-name: Reproducible Bug Report
+name: New issue for Reproducible Bug
 about: "If you're sure it's reproducible and not just your machine: submit an issue so we can investigate."
 
 ---
 
-**Please note we will close your issue without comment if you delete, do not read or do not fill out the issue checklist below and provide ALL the requested information. If you repeatedly fail to use the issue template, we will block you from ever submitting issues to Homebrew again.**
+# Please note we will close your issue without comment if you delete, do not read or do not fill out the issue checklist below and provide ALL the requested information. If you repeatedly fail to use the issue template, we will block you from ever submitting issues to Homebrew again.
 
 - [ ] ran `brew update` and can still reproduce the problem?
 - [ ] ran `brew doctor`, fixed all issues and can still reproduce the problem?
 - [ ] ran `brew gist-logs <formula>` (where `<formula>` is the name of the formula that failed) and included the output link?
 - [ ] if `brew gist-logs` didn't work: ran `brew config` and `brew doctor` and included their output with your issue?
 
-To help us debug your issue please explain:
+<!-- To help us debug your issue, please complete these sections: -->
 
-- What you were trying to do (and why)
-- What happened (include command output)
-- What you expected to happen
-- Step-by-step reproduction instructions (by running `brew install` commands)
+## What you were trying to do (and why)
+
+<!-- replace me -->
+
+## What happened (include command output)
+
+<!-- replace me -->
+
+<details>
+  <summary>Command output</summary>
+  <pre>
+
+  <!-- replace this with the command output -->
+
+  </pre>
+</details>
+
+## What you expected to happen
+
+<!-- replace me -->
+
+## Step-by-step reproduction instructions (by running `brew install` commands)
+
+<!-- replace me -->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index b7cb25a289..2319d1cec9 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,15 +1,15 @@
 blank_issues_enabled: false
 
 contact_links:
-- name: Discourse
+- name: Get help on Discourse
   url: https://discourse.brew.sh
   about: Have a question? Not sure if your issue affects everyone reproducibly? The quickest way to get help is on Homebrew's Discourse!
-- name: Homebrew/brew
+- name: New issue on Homebrew/brew
   url: https://github.com/Homebrew/brew/issues/new/choose
   about: Having a `brew` problem that's not from a `brew install` or `brew upgrade` of a single formula/package? Report it to Homebrew/brew (the Homebrew package manager).
-- name: Homebrew/homebrew-cask
+- name: New issue on Homebrew/homebrew-cask
   url: https://github.com/Homebrew/homebrew-cask/issues/new/choose
   about: Having a `brew cask` problem? Report it to Homebrew/homebrew-cask (the cask tap/repository)
-- name: Homebrew/linuxbrew-core
+- name: New issue on Homebrew/linuxbrew-core
   url: https://github.com/Homebrew/linuxbrew-core/issues/new/choose
   about: On Linux? Having a `brew` problem with a `brew install` or `brew upgrade` of a single formula/package? Report it to Homebrew/linuxbrew-core (the Linux core tap/repository).