diff --git a/.gitea/issue_template.md b/.gitea/issue_template/bug_template.md
similarity index 80%
rename from .gitea/issue_template.md
rename to .gitea/issue_template/bug_template.md
index 99b1c654..0cc12d95 100644
--- a/.gitea/issue_template.md
+++ b/.gitea/issue_template/bug_template.md
@@ -1,14 +1,22 @@
+---
+
+name: "Bug or question/support"
+about: "This is for filing a bug or getting support"
+ref: "main"
+
+---
+
 #### What I'm trying to do and why
 
-#### Steps to reproduce (if a bug)
+#### Steps to reproduce
 
 Include (sanitized) borgmatic configuration files if applicable.
 
-#### Actual behavior (if a bug)
+#### Actual behavior
 
 Include (sanitized) `--verbosity 2` output if applicable.
 
-#### Expected behavior (if a bug)
+#### Expected behavior
 
 #### Other notes / implementation ideas
 
diff --git a/.gitea/issue_template/feature_template.md b/.gitea/issue_template/feature_template.md
new file mode 100644
index 00000000..b6261dee
--- /dev/null
+++ b/.gitea/issue_template/feature_template.md
@@ -0,0 +1,11 @@
+---
+
+name: "Feature"
+about: "This is for filing a feature request or idea"
+ref: "main"
+
+---
+
+#### What I'd like to do and why
+
+#### Other notes / implementation ideas