diff --git a/.github/ISSUE_TEMPLATE/bug-report---.md b/.github/ISSUE_TEMPLATE/bug-report---.md
deleted file mode 100644
index 62d8ebc1cb..0000000000
--- a/.github/ISSUE_TEMPLATE/bug-report---.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-name: "Bug report \U0001F41B"
-about: Create a report to help us improve
-title: ''
-labels: S-bug
-assignees: ''
-
----
-
-**Version**
-List the version(s) of `hyper`, and any relevant hyper dependency (such as `h2` if this is related to HTTP/2).
-
-**Platform**
-The output of `uname -a` (UNIX), or version and 32 or 64-bit (Windows)
-
-**Description**
-Enter your issue details here.
-One way to structure the description:
-
-[short summary of the bug]
-
-I tried this code:
-
-[code sample that causes the bug]
-
-I expected to see this happen: [explanation]
-
-Instead, this happened: [explanation]
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 8ed604a446..62d8ebc1cb 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,5 +1,5 @@
 ---
-name: Bug report
+name: "Bug report \U0001F41B"
 about: Create a report to help us improve
 title: ''
 labels: S-bug
diff --git a/.github/ISSUE_TEMPLATE/feature-request---.md b/.github/ISSUE_TEMPLATE/feature-request---.md
deleted file mode 100644
index 424e5ba9be..0000000000
--- a/.github/ISSUE_TEMPLATE/feature-request---.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: "Feature request \U0001F4A1"
-about: Suggest an idea for this project
-title: ''
-labels: S-feature
-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 [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 53f29830e3..424e5ba9be 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,5 +1,5 @@
 ---
-name: Feature request
+name: "Feature request \U0001F4A1"
 about: Suggest an idea for this project
 title: ''
 labels: S-feature