diff --git a/.gitea/issue_templates/issue_template.md b/.gitea/issue_template/bug.md
similarity index 83%
rename from .gitea/issue_templates/issue_template.md
rename to .gitea/issue_template/bug.md
index 49256c370..a7a8c8f2f 100644
--- a/.gitea/issue_templates/issue_template.md
+++ b/.gitea/issue_template/bug.md
@@ -1,8 +1,16 @@
-### Issue
+---
+
+name: "Bug"
+about: "Something isn't working"
+labels:
+
+- Bug
+
+---
 
 <!-- Please, describe the issue here -->
 
-### Steps for reproducing the issue
+## # Steps for reproducing the issue
 
 <!-- Step, to reproduce it -->
 
diff --git a/.gitea/issue_templates/improvement_template.md b/.gitea/issue_template/feature.md
similarity index 53%
rename from .gitea/issue_templates/improvement_template.md
rename to .gitea/issue_template/feature.md
index 312bce303..74215f1df 100644
--- a/.gitea/issue_templates/improvement_template.md
+++ b/.gitea/issue_template/feature.md
@@ -1,4 +1,14 @@
-### Describe the improvement
+---
+
+name: "Feature"
+about: "A new feature or an enhancement to an existing feature"
+labels:
+
+- Feature
+
+---
+
+## # Describe the improvement
 
 <!-- Your social network -->
 <!-- Put a x between brackets like: - [x] Mastodon -->