diff --git a/.gitea/issue_template.md b/.gitea/issue_template.md
deleted file mode 100644
index 90beb7e..0000000
--- a/.gitea/issue_template.md
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Please search existing issues to avoid duplicates
-
-Issues about claim verification should be opened at:
-https://codeberg.org/keyoxide/doipjs/issues
-
-New suggestions for services to claim should also be opened at:
-https://codeberg.org/keyoxide/doipjs/issues
-
-Feel free to remove this comment -->
diff --git a/.gitea/issue_template/bug.md b/.gitea/issue_template/bug.md
new file mode 100644
index 0000000..993a6f5
--- /dev/null
+++ b/.gitea/issue_template/bug.md
@@ -0,0 +1,16 @@
+---
+name: 'Bug'
+about: 'Report a bug'
+title: '[BUG] '
+ref: 'dev'
+labels:
+  - Status/Backlog
+  - Type/Bug
+---
+
+### What happened
+
+
+
+### Proposed solutions
+
diff --git a/.gitea/issue_template/claim_verification_bug.yml b/.gitea/issue_template/claim_verification_bug.yml
new file mode 100644
index 0000000..2b8f05f
--- /dev/null
+++ b/.gitea/issue_template/claim_verification_bug.yml
@@ -0,0 +1,8 @@
+name: Claim verification bug
+about: Report a claim no longer verifying, or not verifying as it should
+title: ''
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please open this issue in the [doip-js repo](https://codeberg.org/keyoxide/doipjs/issues/new/choose) instead.      
\ No newline at end of file
diff --git a/.gitea/issue_template/enhancement.md b/.gitea/issue_template/enhancement.md
new file mode 100644
index 0000000..2d2553c
--- /dev/null
+++ b/.gitea/issue_template/enhancement.md
@@ -0,0 +1,12 @@
+---
+name: 'Enhancement'
+about: 'Suggest a new feature or improve an existing one'
+title: ''
+ref: 'dev'
+labels:
+  - Status/Backlog
+  - Type/Enhancement
+---
+
+### Proposal
+
diff --git a/.gitea/issue_template/new_claim.yml b/.gitea/issue_template/new_claim.yml
new file mode 100644
index 0000000..731ae3b
--- /dev/null
+++ b/.gitea/issue_template/new_claim.yml
@@ -0,0 +1,8 @@
+name: New claim
+about: Suggest a new service provider or website for identity verification
+title: ''
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please open this issue in the [doip-js repo](https://codeberg.org/keyoxide/doipjs/issues/new/choose) instead.      
\ No newline at end of file