diff --git a/.gitea/issue_template.md b/.gitea/issue_template/bug.md
similarity index 61%
rename from .gitea/issue_template.md
rename to .gitea/issue_template/bug.md
index 727faec8..05c82f17 100644
--- a/.gitea/issue_template.md
+++ b/.gitea/issue_template/bug.md
@@ -1,22 +1,22 @@
-## # What do you want to address?
-<!-- This step is required; examples are shown below -->
+---
 
-- [ ] Bug
-- [ ] Feature
-- [ ] Suggestion
+name: "Bug"
+about: "Something isn't working"
+labels:
+
+- Bug
+
+---
 
 ## # Describe your matter briefly
-<!-- This step is required. -->
 <br><br>
 
-##### What did you expect? <!-- Useful when addressing bugs -->
+##### What did you expect?
 ---
-<!-- This step is optional. -->
 <br><br>
 
-##### Some additional details <!-- Useful, when we are trying to reproduce a bug -->
+##### Some additional details
 ---
-<!-- This step is optional; an example is shown below -->
 
 * The version of **Gitea** you are using: 
 * The version of **GitNex** you are using: 
@@ -34,4 +34,4 @@
 - [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/main/CONTRIBUTING.md).
 <br>
 
-#### Thank you for your time.
\ No newline at end of file
+<!-- Thank you for your time. -->
\ No newline at end of file
diff --git a/.gitea/issue_template/feature.md b/.gitea/issue_template/feature.md
new file mode 100644
index 00000000..ff712012
--- /dev/null
+++ b/.gitea/issue_template/feature.md
@@ -0,0 +1,17 @@
+---
+
+name: "Feature"
+about: "A new feature or an enhancement to an existing feature"
+labels:
+
+- Feature
+
+---
+
+## # Describe your matter briefly
+<br><br>
+
+- [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/main/CONTRIBUTING.md).
+<br>
+
+<!-- Thank you for your time. -->
diff --git a/.gitea/issue_template/suggestion.md b/.gitea/issue_template/suggestion.md
new file mode 100644
index 00000000..d40f242a
--- /dev/null
+++ b/.gitea/issue_template/suggestion.md
@@ -0,0 +1,37 @@
+---
+
+name: "Suggestion"
+about: "A general suggestion"
+labels:
+
+- Suggestion
+
+---
+
+## # Describe your matter briefly
+<br><br>
+
+##### What did you expect?
+---
+<br><br>
+
+##### Some additional details
+---
+
+* The version of **Gitea** you are using: 
+* The version of **GitNex** you are using: 
+* Source of installation (Play Store, F-Droid, APK): 
+* Current android version and phone model/manufacturer: 
+* The type of certificate your instance is using (self-signed, signed): 
+* How you used to log in (via password or token): 
+<br>
+
+##### We would appreciate some screenshots or stacktrace's, but this is also not required.
+---
+<!-- Screenshots and stacktrace's can go here. -->
+<br><br>
+
+- [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/main/CONTRIBUTING.md).
+<br>
+
+<!-- Thank you for your time. -->