diff --git a/.gitea/issue_template/bug-report-ui.yaml b/.gitea/issue_template/bug-report-ui.yaml
index 4d80198399..09513d08e7 100644
--- a/.gitea/issue_template/bug-report-ui.yaml
+++ b/.gitea/issue_template/bug-report-ui.yaml
@@ -1,7 +1,7 @@
 name: 🦋 Bug Report (web interface / frontend)
 description: Something doesn't look quite as it should?  Report it here!
 title: "[BUG] "
-labels: ["bug", "forgejo/ui"]
+labels: ["bug/new-report", "forgejo/ui"]
 body:
 - type: markdown
   attributes:
diff --git a/.gitea/issue_template/bug-report.yaml b/.gitea/issue_template/bug-report.yaml
index ce67378175..6edbca886f 100644
--- a/.gitea/issue_template/bug-report.yaml
+++ b/.gitea/issue_template/bug-report.yaml
@@ -1,7 +1,7 @@
 name: 🐛 Bug Report (server / backend)
 description: Found something you weren't expecting? Report it here!
 title: "[BUG] "
-labels: bug
+labels: bug/new-report
 body:
 - type: markdown
   attributes:
diff --git a/.gitea/pull_request_template.md b/.gitea/pull_request_template.md
index 385300ddf8..00b874fd5b 100644
--- a/.gitea/pull_request_template.md
+++ b/.gitea/pull_request_template.md
@@ -1,3 +1,12 @@
+---
+
+name: "Pull Request Template"
+about: "Template for all Pull Requests"
+labels:
+
+- test/needed
+
+---
 <!--
 Before submitting a PR, please read the contributing guidelines:
 https://codeberg.org/forgejo/forgejo/src/branch/forgejo/CONTRIBUTING.md