diff --git a/.forgejo/ISSUE_TEMPLATE/bug-report.yaml b/.forgejo/ISSUE_TEMPLATE/bug-report.yaml
new file mode 100644
index 000000000..5ac2e1ce3
--- /dev/null
+++ b/.forgejo/ISSUE_TEMPLATE/bug-report.yaml
@@ -0,0 +1,70 @@
+name: 🐞 Bug Report
+description: Report a problem you've encountered
+title: "bug: "
+labels:
+  - bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ⚠ **Have you searched for similar, already existing issues?**
+        Please do that before submitting a new one.
+
+  - type: textarea
+    id: issue-description
+    attributes:
+      label: Describe the issue
+      description: Please write a clear and concise description of the issue here.
+      placeholder: Describe what is not working as expected...
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to reproduce
+      description: Describe the steps needed to reproduce the issue.
+      placeholder: |
+        1. Go to '...'
+        2. Click on '...'
+        3. Scroll down to '...'
+        4. See the error
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behaviour
+      description: A clear and concise description of what you expected to happen.
+      placeholder: I expected that...
+    validations:
+      required: false
+
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: If applicable, add screenshots or screen recordings to help explain your problem.
+    validations:
+      required: false
+
+  - type: textarea
+    id: system-info
+    attributes:
+      label: System information
+      description: Provide information about the system where the issue occurred.
+      placeholder: |
+        - OS: e.g. Ubuntu 22, iOS 12
+        - CoMaps version: e.g. 1.2.3
+        - Device model: e.g. iPhone 6, Samsung S22
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Add any other context or comments that may be useful.
+    validations:
+      required: false
\ No newline at end of file
diff --git a/.forgejo/ISSUE_TEMPLATE/bug_report.md b/.forgejo/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index b0eaa8c7d..000000000
--- a/.forgejo/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-name: Bug Report
-about: Describe your issue in detail to help us improve CoMaps
-title: ''
-labels: ''
-assignees: ''
-
----
-
-⚠ Have you searched for similar, already existing issues?
-
-**Describe the issue**
-Please write a clear and concise description of the issue here.
-
-
-**Steps to reproduce**
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-
-**Expected behaviour**
-A clear and concise description of what you expected to happen.
-
-
-**Screenshots**
-If applicable, add screenshots or screen recordings to help explain your problem.
-
-
-**System information:**
- - Operating system and its version: [iOS 12, Android 10, Ubuntu 22, MacOS Big Sur, etc.]
- - CoMaps version: [you can find it by tapping the button with the CoMaps logo]
- - Device Model: [e.g. iPhone 6, Samsung S22]
-
-
-**Additional context**
-Please add any other context or comments here that may be useful.
diff --git a/.forgejo/ISSUE_TEMPLATE/feature-request.yaml b/.forgejo/ISSUE_TEMPLATE/feature-request.yaml
new file mode 100644
index 000000000..91a2a6678
--- /dev/null
+++ b/.forgejo/ISSUE_TEMPLATE/feature-request.yaml
@@ -0,0 +1,47 @@
+name: "💡 Feature Request"
+description: "Suggest an idea or improvement for CoMaps"
+title: "feat: "
+labels:
+  - "enhancement"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ⚠ **Have you searched for similar, already existing issues?**
+        Please make sure your idea hasn't been suggested before.
+
+  - type: textarea
+    id: related-problem
+    attributes:
+      label: "What problem would this feature help solve?"
+      description: "Share how this feature could make the experience better, smoother, or more enjoyable."
+      placeholder: "It would be great if..."
+    validations:
+      required: true
+
+  - type: textarea
+    id: ideal-solution
+    attributes:
+      label: "Describe the ideal solution"
+      description: "What would you like to see in CoMaps?"
+      placeholder: "I would like CoMaps to..."
+    validations:
+      required: false
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: "Describe alternatives you have considered"
+      description: |
+        How do you solve this issue now with CoMaps or other apps?
+        You can also share screenshots or examples from other apps.
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: "Additional context"
+      description: "Any other context, comments, or screenshots to support your request."
+    validations:
+      required: false
\ No newline at end of file
diff --git a/.forgejo/ISSUE_TEMPLATE/feature_request.md b/.forgejo/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 3cd87513d..000000000
--- a/.forgejo/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-name: Feature Request
-about: Suggest an idea for CoMaps
-title: ''
-labels: []
-assignees: ''
-
----
-
-⚠ Have you searched for similar, already existing issues?
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. For example:
-I'm always frustrated when [...]
-
-
-**Describe the ideal solution**
-A clear and concise description of what you want to see in CoMaps.
-
-
-**Describe alternatives you have considered**
-- How do you solve this issue now with CoMaps or other apps?
-- Attach any examples, screenshots, or screen recordings from other apps that help us to better understand the idea.
-
-
-**Additional context**
-Add any other context or screenshots about the feature request here.