diff --git a/.gitea/issue_templates/improvement_template.md b/.gitea/issue_templates/improvement_template.md
new file mode 100644
index 00000000..48b166f1
--- /dev/null
+++ b/.gitea/issue_templates/improvement_template.md
@@ -0,0 +1,12 @@
+### Describe the improvement
+
+<!-- Your social network -->
+<!-- Put a x between brackets like: - [x] Mastodon -->
+
+- [ ] Mastodon
+- [ ] Pleroma
+- [ ] Friendica
+- [ ] Pixelfed
+
+<!-- If you read our contributing advice -->
+[ ] - I read the [contributing page](../../CONTRIBUTING.md)
\ No newline at end of file
diff --git a/.gitea/issue_templates/issue_template.md b/.gitea/issue_templates/issue_template.md
new file mode 100644
index 00000000..49256c37
--- /dev/null
+++ b/.gitea/issue_templates/issue_template.md
@@ -0,0 +1,32 @@
+### Issue
+
+<!-- Please, describe the issue here -->
+
+### Steps for reproducing the issue
+
+<!-- Step, to reproduce it -->
+
+
+---
+<!-- The instance you are using -->
+Instance:
+
+<!-- Your social network -->
+<!-- Put a x between brackets like: - [x] Mastodon -->
+
+- [ ] Mastodon
+- [ ] Pleroma
+- [ ] Friendica
+- [ ] Pixelfed
+
+<!-- If you know the version of Fedilab that you are using (can be found in about page) -->
+Version of Fedilab:
+
+
+<!-- Your Android version -->
+Android version:
+
+
+<!-- If you read our contributing advice -->
+[ ] - I read the [contributing page](../../CONTRIBUTING.md)
+
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a6f6fe98..0c0ad1be 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,4 +8,14 @@ tools for helping in translations. New translations will be automatically merged
 
 If you're submiting a merge request and your work adds new strings to the app, make sure they only
 exist in the default strings.xml file (res/values/strings.xml). If you add or modify strings of
-other languages, it will interfere with weblate's translations.
\ No newline at end of file
+other languages, it will interfere with weblate's translations.
+
+### Issues and Reports:
+
+Before creating an issue please take a moment and search the repository issues to avoid duplicates.
+For bug reports, please provide as much details as possible to better debug the problem. The
+important part is how to reproduce the bug and steps to reproduce it.
+
+### Pull Requests
+
+Please target the develop branch and not the main branch.
\ No newline at end of file