diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index b725053b65..fc5083b99f 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,7 +1,7 @@
 name: Bug Report
 description: File a bug report also known as an issue or problem.
 title: '[Bug]: '
-labels: ['needs triage', 'bug']
+labels: ['needs triage']
 type: Bug
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index d511436a25..322d7c0f73 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -1,7 +1,7 @@
 name: Feature request
 description: Request a missing feature
 title: '[Feature] '
-labels: ['feature']
+labels: []
 type: Feature
 body:
   - type: markdown
diff --git a/upcoming-release-notes/no-bug-label.md b/upcoming-release-notes/no-bug-label.md
new file mode 100644
index 0000000000..3681195290
--- /dev/null
+++ b/upcoming-release-notes/no-bug-label.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [youngcw]
+---
+
+Dont add duplicate labels to bug and feature issues when there is already a type set