diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/---feature-request.md
index 869b7794..2862e063 100644
--- a/.github/ISSUE_TEMPLATE/---feature-request.md
+++ b/.github/ISSUE_TEMPLATE/---feature-request.md
@@ -3,7 +3,7 @@ name: "\U0001F4A1 Feature request"
 about: Suggest a feature or enhancement for cloudflared
 title: "\U0001F4A1"
 labels: 'Priority: Normal, Type: Feature Request'
-assignees: sssilver, abelinkinbio
+assignees: abelinkinbio, sssilver
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/bug-report---.md b/.github/ISSUE_TEMPLATE/bug-report---.md
deleted file mode 100644
index bb54d9f8..00000000
--- a/.github/ISSUE_TEMPLATE/bug-report---.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: "Bug report \U0001F41B"
-about: Create a report to help us improve cloudflared
-title: ''
-labels: awaiting reply, bug
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Configure '...'
-2. Run '....'
-3. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Environment and versions**
- - OS: [e.g. MacOS]
- - Architecture: [e.g. AMD, ARM]
- - Version: [e.g. 2022.02.0]
-
-**Logs and errors**
-If applicable, add logs or errors to help explain your problem.
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature-request---.md b/.github/ISSUE_TEMPLATE/feature-request---.md
deleted file mode 100644
index 62fdbe20..00000000
--- a/.github/ISSUE_TEMPLATE/feature-request---.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: "Feature request \U0001F4A1"
-about: Suggest a feature or enhancement for cloudflared
-title: ''
-labels: awaiting reply, feature-request
-assignees: ''
-
----
-
-**Describe the feature you'd like**
-A clear and concise description of the feature. What problem does it solve for you?
-
-**Describe alternatives you've considered**
-Are there any alternatives to solving this problem? If so, what was your experience with them?
-
-**Additional context**
-Add any other context or screenshots about the feature request here.