diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md
new file mode 100644
index 0000000..21417fa
--- /dev/null
+++ b/doc/DISCLAIMER.md
@@ -0,0 +1,3 @@
+## Configuration
+
+You can do most configuration of CouchDB from fauxton, the web interface, accessible at the domain you specified: https://domain.tld/_utils/index.html
diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md
new file mode 100644
index 0000000..116edf3
--- /dev/null
+++ b/doc/DISCLAIMER_fr.md
@@ -0,0 +1,3 @@
+## Configuration
+
+Vous pouvez effectuer la plupart des configurations de CouchDB à partir de fauxton, l'interface Web, accessible sur le domaine que vous avez spécifié : https://domain.tld/_utils/index.html 
diff --git a/doc/screenshots/Apache_CouchDB_v2.1.1_Fauxton_Console.png b/doc/screenshots/Apache_CouchDB_v2.1.1_Fauxton_Console.png
new file mode 100644
index 0000000..5440af3
Binary files /dev/null and b/doc/screenshots/Apache_CouchDB_v2.1.1_Fauxton_Console.png differ
diff --git a/manifest.json b/manifest.json
index 829123f..e709731 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,13 +1,20 @@
 {
-    "name": "Couchdb",
+    "name": "CouchDB",
     "id": "couchdb",
     "packaging_format": 1,
     "description": {
-        "en": "An open-source document-oriented NoSQL database.",
-        "fr": "Système de gestion de base de données orienté documents."
+        "en": "An open-source document-oriented NoSQL database",
+        "fr": "Système de gestion de base de données orienté documents"
     },
-    "version": "3.1.1~ynh1",
+    "version": "3.1.1~ynh2",
     "url": "https://couchdb.apache.org/",
+    "upstream": {
+        "license": "Apache-2.0",
+        "website": "https://couchdb.apache.org/",
+        "admindoc": "https://docs.couchdb.org/en/stable/",
+        "userdoc": "https://yunohost.org/apps",
+        "code": "https://github.com/apache/couchdb"
+    },
     "license": "Apache-2.0",
     "maintainer": {
         "name": "Squeak",
@@ -38,8 +45,8 @@
                 "name": "is_public",
                 "type": "boolean",
                 "help": {
-                    "en": "If enabled, couchdb will be accessible without yunohost account on your server, but couchdb contains it's own user authentication system.",
-                    "fr": "Si cette case est cochée, couchdb sera accessible aux personnes n’ayant pas de compte yunohost sur votre serveur, mais couchdb a son propre système d'autentification des utilisateurs."
+                    "en": "If enabled, CouchDB will be accessible without YunoHost account on your server, but CouchDB contains it's own user authentication system.",
+                    "fr": "Si cette case est cochée, CouchDB sera accessible aux personnes n’ayant pas de compte YunoHost sur votre serveur, mais CouchDB a son propre système d'autentification des utilisateurs."
                 },
                 "default": true
             },
diff --git a/scripts/install b/scripts/install
index a35ca37..143a6c4 100755
--- a/scripts/install
+++ b/scripts/install
@@ -95,12 +95,9 @@ couchdb couchdb/adminpass_again password ${COUCHDB_PASSWORD}
 couchdb couchdb/adminpass_again seen true" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive # apt-get install -y --force-yes couchdb
 
-apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 390EF70BB1EA12B2773962950EE62FB37A00258D
+apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 390EF70BB1EA12B2773962950EE62FB37A00258D 2>/dev/null
 
-#ynh_install_extra_app_dependencies --repo="https://apache.bintray.com/couchdb-deb buster main" --package="couchdb"
-# ynh_install_extra_app_dependencies --repo="https://apache.bintray.com/couchdb-deb buster main" --package="couchdb" --key="https://apache.bintray.com/couchdb-deb/dists/buster/Release.gpg"
-
-ynh_install_extra_app_dependencies --repo="https://apache.jfrog.io/artifactory/couchdb-deb/ buster main" --package="couchdb" #--key="https://apache.jfrog.io/artifactory/couchdb-deb/dists/buster/Release.gpg"
+ynh_install_extra_app_dependencies --repo="https://apache.jfrog.io/artifactory/couchdb-deb/ buster main" --package="couchdb"
 
 #=================================================
 # ADD SOME CUSTOM CONFIGURATION TO COUCH
diff --git a/scripts/restore b/scripts/restore
index 850782a..55b864a 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -93,11 +93,9 @@ couchdb couchdb/adminpass_again password ${COUCHDB_PASSWORD}
 couchdb couchdb/adminpass_again seen true" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive # apt-get install -y --force-yes couchdb
 
-apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8756C4F765C9AC3CB6B85D62379CE192D401AB61
+apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 390EF70BB1EA12B2773962950EE62FB37A00258D 2>/dev/null
 
-# ynh_add_app_dependencies --package="ca-certificates" # done before, when installing dependencies
-ynh_install_extra_app_dependencies --repo="https://apache.bintray.com/couchdb-deb buster main" --package="couchdb"
-# ynh_install_extra_app_dependencies --repo="https://apache.bintray.com/couchdb-deb buster main" --package="couchdb" --key="https://apache.bintray.com/couchdb-deb/dists/buster/Release.gpg"
+ynh_install_extra_app_dependencies --repo="https://apache.jfrog.io/artifactory/couchdb-deb/ buster main" --package="couchdb"
 
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
diff --git a/scripts/upgrade b/scripts/upgrade
index a3487bf..f379d9d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -43,22 +43,6 @@ ynh_clean_setup () {
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
-#=================================================
-# STANDARD UPGRADE STEPS
-#=================================================
-# ENSURE DOWNWARD COMPATIBILITY
-#=================================================
-ynh_script_progression --message="Ensuring downward compatibility..." --weight=4
-
-# Cleaning legacy permissions
-if ynh_legacy_permissions_exists; then
-	ynh_legacy_permissions_delete_all
-
-	ynh_app_setting_delete --app=$app --key=is_public
-fi
-
-ynh_permission_url --permission="main" --url="/_utils/index.html" --add_url="/" --auth_header=false
-
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -92,10 +76,9 @@ couchdb couchdb/adminpass_again password ${COUCHDB_PASSWORD}
 couchdb couchdb/adminpass_again seen true" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive # apt-get install -y --force-yes couchdb
 
-apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8756C4F765C9AC3CB6B85D62379CE192D401AB61
+apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 390EF70BB1EA12B2773962950EE62FB37A00258D 2>/dev/null
 
-ynh_install_extra_app_dependencies --repo="https://apache.bintray.com/couchdb-deb buster main" --package="couchdb"
-# ynh_install_extra_app_dependencies --repo="https://apache.bintray.com/couchdb-deb buster main" --package="couchdb" --key="https://apache.bintray.com/couchdb-deb/dists/buster/Release.gpg"
+ynh_install_extra_app_dependencies --repo="https://apache.jfrog.io/artifactory/couchdb-deb/ buster main" --package="couchdb"
 
 #=================================================
 # UPDATE A CONFIG FILE