diff --git a/.gitea/ISSUE_TEMPLATE/bug.md b/.gitea/ISSUE_TEMPLATE/bug.md
new file mode 100644
index 00000000..ab53a8be
--- /dev/null
+++ b/.gitea/ISSUE_TEMPLATE/bug.md
@@ -0,0 +1,16 @@
+---
+name: Bug
+about: Something is broken
+labels: bug
+---
+
+**What happens**
+
+**What should happen**
+
+**Repro steps**
+
+1.
+2.
+
+**GDD reference (if relevant):** §
diff --git a/.gitea/ISSUE_TEMPLATE/system.md b/.gitea/ISSUE_TEMPLATE/system.md
new file mode 100644
index 00000000..b36f2e13
--- /dev/null
+++ b/.gitea/ISSUE_TEMPLATE/system.md
@@ -0,0 +1,24 @@
+---
+name: System work
+about: A piece of code/system implementation
+labels: system
+---
+
+**GDD reference:**
+
+**Goal**
+
+<!-- One sentence: what this issue accomplishes -->
+
+**Acceptance criteria**
+
+- [ ]
+- [ ]
+
+**Dependencies**
+
+<!-- Issues that must be done first -->
+
+**Notes**
+
+<!-- Open questions, design caveats, links -->