diff --git a/README.md b/README.md
index 04f0237..0fb6b56 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,15 @@
# Friendica social network for YunoHost
-[](https://dash.yunohost.org/appci/app/friendica)
+[](https://dash.yunohost.org/appci/app/friendica)  
[](https://install-app.yunohost.org/?app=friendica)
-> *This package allow you to install Friendica quickly and simply on a YunoHost server.
-If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
+> *This package allows you to install Friendica quickly and simply on a YunoHost server.
+If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
## Overview
Friendica (formerly Friendika, originally Mistpark) is an open, free, distributed social network. It forms one part of the Fediverse, an interconnected and decentralized network of independently operated servers.
-**Version:2020.03**
+**Shipped version:** 2020.03
## Screenshots
@@ -21,7 +21,7 @@ Before installing, read the [Friendica installation instructions](https://github
- SSL certificate validation requirement (now with support for [Let's Encrypt!](https://letsencrypt.org)). See Installation section below.
- Dedicated domain (must install under web root like **https://hub.example.com/** not **https://example.com/hub/** )
-#### Multi-users support
+#### Multi-user support
LDAP auth supported. There are not yet active SSO.
@@ -46,7 +46,7 @@ Public users can register and use the instance as normal users. SSO users can lo
#### Supported architectures
-* x86-64b - [](https://ci-apps.yunohost.org/ci/apps/friendica/)
+* x86-64 - [](https://ci-apps.yunohost.org/ci/apps/friendica/)
* ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/friendica/)
## Links
@@ -57,11 +57,11 @@ Public users can register and use the instance as normal users. SSO users can lo
* YunoHost website: https://yunohost.org/
---
-Developers info
+
+Developer info
----------------
-**Only if you want to use a testing branch for coding, instead of merging directly into master.**
-Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/friendica_ynh/tree/testing).
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/friendica_ynh/tree/testing).
To try the testing branch, please proceed like that.
```
diff --git a/issue_template.md b/issue_template.md
new file mode 100644
index 0000000..289bba6
--- /dev/null
+++ b/issue_template.md
@@ -0,0 +1,46 @@
+---
+name: Bug report
+about: Create a report to help us debug, it would be nice to fill the template as much as you can to help us, help you and help us all.
+
+---
+
+**How to post a meaningful bug report**
+1. *Read this whole template first.*
+2. *Determine if you are on the right place:*
+ - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change url...), you are on the right place!*
+ - *Otherwise, the issue may be due to Friendica itself. Refer to its documentation or repository for help.*
+ - *If you have a doubt, post here, we will figure it out together.*
+3. *Delete the italic comments as you write over them below, and remove this guide.*
+---
+
+**Describe the bug**
+*A clear and concise description of what the bug is.*
+
+**Versions**
+- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...*
+- YunoHost version: x.x.x
+- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...*
+- Are you in a special context or did you perform some particular tweaking on your YunoHost instance ?: *no / yes*
+ - If yes, please explain:
+- Using, or trying to install package version/branch:
+- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`*
+
+**To Reproduce**
+*Steps to reproduce the behavior.*
+- *If you performed a command from the CLI, the command itself is enough. For example:*
+ ```sh
+ sudo yunohost app install friendica
+ ```
+- *If you used the webadmin, please perform the equivalent command from the CLI first.*
+- *If the error occurs in your browser, explain what you did:*
+ 1. *Go to '...'*
+ 2. *Click on '....'*
+ 3. *Scroll down to '....'*
+ 4. *See error*
+
+**Expected behavior**
+*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.*
+
+**Logs**
+*After a failed command, YunoHost makes the log available to you, but also to others, thanks to `yunohost log display [log name] --share`. The actual command, with the correct log name, is displayed at the end of the failed attempt in the CLI. Execute it and copy here the share link it outputs.*
+*If applicable and useful, add screenshots to help explain your problem.*
diff --git a/pull_request_template.md b/pull_request_template.md
index 0287f9f..cb5be40 100644
--- a/pull_request_template.md
+++ b/pull_request_template.md
@@ -15,4 +15,4 @@
---
*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results*
-[/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/REPLACEBYYOURAPP_ynh%20PR-NUM-%20(USERNAME)/)
+[/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/friendica_ynh%20PR-NUM-%20(USERNAME)/)