diff --git a/.github/ISSUE_TEMPLATE/bug_report_docker.md b/.github/ISSUE_TEMPLATE/bug_report_docker.md
index f1cddc738..a47e30657 100644
--- a/.github/ISSUE_TEMPLATE/bug_report_docker.md
+++ b/.github/ISSUE_TEMPLATE/bug_report_docker.md
@@ -1,8 +1,8 @@
 ---
-name: Local installation bug report
+name: Docker bug report
 about: Create a bug report
 labels:
-- kind/bug
+- bug
 - area/docker
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/bug_report_local_install.md b/.github/ISSUE_TEMPLATE/bug_report_local_install.md
index f0798db1f..329a3ae88 100644
--- a/.github/ISSUE_TEMPLATE/bug_report_local_install.md
+++ b/.github/ISSUE_TEMPLATE/bug_report_local_install.md
@@ -1,8 +1,8 @@
 ---
-name: Docker bug report
+name: Local installation bug report
 about: Create a bug report
 labels:
-- kind/bug
+- bug
 - area/local_installation
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 8d9f73189..d1b4b6424 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 labels:
-- kind/feature
+- feature
 ---
 
 <!--