diff --git a/issue_template.md b/.github/ISSUE_TEMPLATE.md
similarity index 94%
rename from issue_template.md
rename to .github/ISSUE_TEMPLATE.md
index f08b4b9..2729a6b 100644
--- a/issue_template.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -8,10 +8,10 @@ about: When creating a bug report, please use the following template to provide
 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 facilmap itself. Refer to its documentation or repository for help.*
+   - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.*
    - *When in doubt, post here and we will figure it out together.*
 3. *Delete the italic comments as you write over them below, and remove this guide.*
----
+--- 
 
 ### Describe the bug
 
@@ -31,7 +31,7 @@ about: When creating a bug report, please use the following template to provide
 
 - *If you performed a command from the CLI, the command itself is enough. For example:*
     ```sh
-    sudo yunohost app install facilmap
+    sudo yunohost app install the_app
     ```
 - *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:*
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..ef70e18
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,16 @@
+## Problem
+
+- *Description of why you made this PR*
+
+## Solution
+
+- *And how do you fix that problem*
+
+## PR Status
+
+- [ ] Code finished and ready to be reviewed/tested
+- [ ] The fix/enhancement were manually tested (if applicable)
+
+## Automatic tests
+
+Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization)
diff --git a/doc/DISLAIMER.md b/doc/DISLAIMER.md
new file mode 100644
index 0000000..e69de29
diff --git a/doc/screenshots/68747470733a2f2f77696b692e6f70656e7374726565746d61702e6f72672f772f696d616765732f372f37612f466163696c4d61702e706e67.png b/doc/screenshots/68747470733a2f2f77696b692e6f70656e7374726565746d61702e6f72672f772f696d616765732f372f37612f466163696c4d61702e706e67.png
new file mode 100644
index 0000000..65fd8b1
Binary files /dev/null and b/doc/screenshots/68747470733a2f2f77696b692e6f70656e7374726565746d61702e6f72672f772f696d616765732f372f37612f466163696c4d61702e706e67.png differ
diff --git a/manifest.json b/manifest.json
index f9188f0..0277cca 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,6 +8,14 @@
     },
     "version": "3.1.0~ynh1",
     "url": "https://github.com/FacilMap/facilmap",
+    "upstream": {
+        "license": "AGPL-3.0",
+        "website": "https://facilmap.org/",
+        "demo": "https://facilmap.org/",
+        "admindoc": "https://docs.facilmap.org/developers/",
+        "userdoc": "https://docs.facilmap.org/users/",
+        "code": "https://github.com/FacilMap/facilmap"
+    },
     "license": "AGPL-3.0",
     "maintainer": {
       "name": "Squeak",
diff --git a/pull_request_template.md b/pull_request_template.md
deleted file mode 100644
index 6c28fc5..0000000
--- a/pull_request_template.md
+++ /dev/null
@@ -1,16 +0,0 @@
-## Problem
-- *Description of why you made this PR*
-
-## Solution
-- *And how do you fix that problem*
-
-## PR Status
-- [ ] Code finished.
-- [ ] Tested with Package_check.
-- [ ] Fix or enhancement tested.
-- [ ] Upgrade from last version tested.
-- [ ] Can be reviewed and tested.
-
-## Package_check results
----
-* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"*
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 109b888..398e25c 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -9,7 +9,7 @@ pkg_dependencies=""
 
 nodejs_version=14
 
-facilmap_version=3.1.0
+facilmap_version=3.3.0
 
 #=================================================
 # PERSONAL HELPERS