diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 1a2f57dc7..ee8b556ba 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,7 +1,7 @@
 ---
 name: Bug Report
 about: Report a bug for dragonfly
-labels: kind/bug
+labels: bug
 
 ---
 
@@ -18,6 +18,7 @@ labels: kind/bug
 <!-- How can a maintainer reproduce this issue (please be detailed) -->
 
 ### Environment:
+
 - Dragonfly version:
 - OS:
 - Kernel (e.g. `uname -a`):
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
index 0103c64c8..3f0b3810a 100644
--- a/.github/ISSUE_TEMPLATE/custom.md
+++ b/.github/ISSUE_TEMPLATE/custom.md
@@ -1,6 +1,5 @@
 ---
-name: Custom
+name: Custom issue template
 about: Custom issue template for dragonfly
-labels: kind/custom
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 7505640e0..de77c5962 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -1,7 +1,7 @@
 ---
 name: Feature Request
 about: Request a new feature for dragonfly
-labels: kind/feature
+labels: enhancement
 
 ---