diff --git a/.gitea/issue_template/PullRequest.yaml b/.gitea/issue_template/PullRequest.yaml
deleted file mode 100644
index 5959049..0000000
--- a/.gitea/issue_template/PullRequest.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Pull Request
-about: Propose changes to the code or implement new features.
-title: "[PR]: "
-labels: ["enhancement", "Management"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        This issue was created by an issue **template** :)
-    visible: [content]
-  - type: textarea
-    id: whats_new
-    attributes:
-      label: What did you add/improve?
-      description: what does this pull request fix, add or improve ?
-      placeholder: Tell us what functionality this pull request adds or the problem it solves!
-    validations:
-      required: true
-  - type: input
-    id: related_issue
-    attributes:
-      label: Does this fix a issue or add a requested feature ?
-      description: If this pull requests fixes a known issue or adds requested functionality please link that issue number here
-    validations:
-      is_number: true
-      required: false
-  - type: textarea
-    id: other_options
-    attributes:
-      label: What other solutions did you concider if any ?
-    validations:
-      required: false
\ No newline at end of file
diff --git a/.gitea/issue_template/BugReport.yaml b/.gitea/issue_template/bug_report_template.yaml
similarity index 97%
rename from .gitea/issue_template/BugReport.yaml
rename to .gitea/issue_template/bug_report_template.yaml
index 8bf6d58..78f270f 100644
--- a/.gitea/issue_template/BugReport.yaml
+++ b/.gitea/issue_template/bug_report_template.yaml
@@ -1,7 +1,7 @@
 name: Bug Report
 about: File a bug report.
 title: "[Bug]: "
-labels: ["bug"]
+labels: ["bug", "Kind/Bug", "Priority Medium"]
 body:
   - type: markdown
     attributes:
diff --git a/.gitea/issue_template/FeatureRequest.yaml b/.gitea/issue_template/feature_request_template.yaml
similarity index 95%
rename from .gitea/issue_template/FeatureRequest.yaml
rename to .gitea/issue_template/feature_request_template.yaml
index 63f7d76..4de0eef 100644
--- a/.gitea/issue_template/FeatureRequest.yaml
+++ b/.gitea/issue_template/feature_request_template.yaml
@@ -1,7 +1,7 @@
 name: New feature Request
 about: Make a request to add a new feature.
 title: "[feature]: "
-labels: ["enhancement"]
+labels: ["enhancement", "Kind/Feature", "Priority low"]
 body:
   - type: markdown
     attributes: