diff --git a/.forgejo/ISSUE_TEMPLATE/bug.yml b/.forgejo/ISSUE_TEMPLATE/bug.yml
index 516498132d..5560b2412d 100644
--- a/.forgejo/ISSUE_TEMPLATE/bug.yml
+++ b/.forgejo/ISSUE_TEMPLATE/bug.yml
@@ -1,6 +1,6 @@
 name: Bug Report
 description: File a bug report
-labels: ["kind/bug"]
+labels: ["bug"]
 body:
   - type: markdown
     attributes:
diff --git a/.forgejo/ISSUE_TEMPLATE/error_message.yml b/.forgejo/ISSUE_TEMPLATE/error_message.yml
index 1bbbbb2e07..3f0f3bc307 100644
--- a/.forgejo/ISSUE_TEMPLATE/error_message.yml
+++ b/.forgejo/ISSUE_TEMPLATE/error_message.yml
@@ -1,6 +1,6 @@
 name: Error message improvement
 description: Compiler produces an unhelpful or misleading error message.
-labels: ["kind/error message"]
+labels: ["error message"]
 body:
   - type: input
     id: version