diff --git a/.gitea/issue_template/bug_template.md b/.gitea/issue_template/bug_template.md
deleted file mode 100644
index 0cc12d95..00000000
--- a/.gitea/issue_template/bug_template.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-
-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
-
-Include (sanitized) borgmatic configuration files if applicable.
-
-#### Actual behavior
-
-Include (sanitized) `--verbosity 2` output if applicable.
-
-#### Expected behavior
-
-#### Other notes / implementation ideas
-
-#### Environment
-
-**borgmatic version:** [version here]
-
-Use `sudo borgmatic --version` or `sudo pip show borgmatic | grep ^Version`
-
-**borgmatic installation method:** [e.g., Debian package, Docker container, etc.]
-
-**Borg version:** [version here]
-
-Use `sudo borg --version`
-
-**Python version:** [version here]
-
-Use `python3 --version`
-
-**Database version (if applicable):** [version here]
-
-Use `psql --version` or `mysql --version` on client and server.
-
-**operating system and version:** [OS here]
diff --git a/.gitea/issue_template/bug_template.yaml b/.gitea/issue_template/bug_template.yaml
new file mode 100644
index 00000000..dd76efda
--- /dev/null
+++ b/.gitea/issue_template/bug_template.yaml
@@ -0,0 +1,77 @@
+name: "Bug or question/support"
+about: "For filing a bug or getting support"
+body:
+  - type: markdown
+    id: problem
+    attributes:
+      label: What I'm trying to do and why
+    validations:
+      required: true
+  - type: markdown
+    id: repro_steps
+    attributes:
+      label: Steps to reproduce
+      description: Include (sanitized) borgmatic configuration files if applicable.
+    validations:
+      required: false
+  - type: markdown
+    id: actual_behavior
+    attributes:
+      label: Actual behavior
+      description: Include (sanitized) `--verbosity 2` output if applicable.
+    validations:
+      required: false
+  - type: markdown
+    id: expected_behavior
+    attributes:
+      label: Expected behavior
+    validations:
+      required: false
+  - type: markdown
+    id: notes
+    attributes:
+      label: Other notes / implementation ideas
+    validations:
+      required: false
+  - type: input
+    id: borgmatic_version
+    attributes:
+      label: borgmatic version
+      description: Use `sudo borgmatic --version` or `sudo pip show borgmatic | grep ^Version`
+    validations:
+      required: false
+  - type: input
+    id: borgmatic_install_method
+    attributes:
+      label: borgmatic installation method
+      description: e.g., pip install, Debian package, container, etc.
+    validations:
+      required: false
+  - type: input
+    id: borg_version
+    attributes:
+      label: Borg version
+      description: Use `sudo borg --version`
+    validations:
+      required: false
+  - type: input
+    id: python_version
+    attributes:
+      label: Python version
+      description: Use `python3 --version`
+    validations:
+      required: false
+  - type: input
+    id: database_version
+    attributes:
+      label: Database version (if applicable)
+      description: Use `psql --version`, `mysql --version`, `mongodump --version`, or `sqlite3 --version`
+    validations:
+      required: false
+  - type: input
+    id: operating_system_version
+    attributes:
+      label: Operating system and version
+      description: On Linux, use `cat /etc/os-release`
+    validations:
+      required: false
diff --git a/.gitea/issue_template/feature_template.md b/.gitea/issue_template/feature_template.md
deleted file mode 100644
index b6261dee..00000000
--- a/.gitea/issue_template/feature_template.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-
-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
diff --git a/.gitea/issue_template/feature_template.yaml b/.gitea/issue_template/feature_template.yaml
new file mode 100644
index 00000000..bde5a6de
--- /dev/null
+++ b/.gitea/issue_template/feature_template.yaml
@@ -0,0 +1,15 @@
+name: "Feature"
+about: "For filing a feature request or idea"
+body:
+  - type: markdown
+    id: request
+    attributes:
+      label: What I'd like to do and why
+    validations:
+      required: true
+  - type: markdown
+    id: notes
+    attributes:
+      label: Other notes / implementation ideas
+    validations:
+      required: false