diff --git a/README.md b/README.md
index 6e5d22c..0d412ac 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Etherpad is a real-time collaborative editor scalable to thousands of simultaneo
 - Scale - Etherpad running at scale with pad sharding which allows Etherpad to scale to ∞ number of Active Pads with up to 20,000 edits per second, per pad.
 
 
-**Shipped version:** 1.8.17~ynh2
+**Shipped version:** 1.8.18~ynh1
 
 **Demo:** https://video.etherpad.com
 
@@ -74,7 +74,7 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether
 ## Documentation and resources
 
 * Official app website: <http://etherpad.org>
-* Official admin documentation: <http://etherpad.org/doc/v1.8.17>
+* Official admin documentation: <http://etherpad.org/doc/v1.8.18>
 * Upstream app code repository: <https://github.com/ether/etherpad-lite>
 * YunoHost documentation for this app: <https://yunohost.org/app_etherpad_mypads>
 * Report a bug: <https://github.com/YunoHost-Apps/etherpad_mypads_ynh/issues>
diff --git a/README_fr.md b/README_fr.md
index 2d19ede..82df587 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -18,7 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers d'utilisateurs simultanés en temps réel. Il fournit des capacités complètes d'exportation de données et s'exécute sur votre serveur, sous votre contrôle.
 
 
-**Version incluse :** 1.8.17~ynh2
+**Version incluse :** 1.8.18~ynh1
 
 **Démo :** https://video.etherpad.com
 
@@ -64,7 +64,7 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa
 ## Documentations et ressources
 
 * Site officiel de l'app : <http://etherpad.org>
-* Documentation officielle de l'admin : <http://etherpad.org/doc/v1.8.17>
+* Documentation officielle de l'admin : <http://etherpad.org/doc/v1.8.18>
 * Dépôt de code officiel de l'app : <https://github.com/ether/etherpad-lite>
 * Documentation YunoHost pour cette app : <https://yunohost.org/app_etherpad_mypads>
 * Signaler un bug : <https://github.com/YunoHost-Apps/etherpad_mypads_ynh/issues>
diff --git a/check_process b/check_process
index 88304b5..4ba93a1 100644
--- a/check_process
+++ b/check_process
@@ -5,25 +5,10 @@
 		is_public=1
 		language="en"
 		admin="john"
-		password="password"
+		password="1Strong-Password"
 		export="libreoffice"
 		mypads=1
 		useldap=1
-    ; Actions
-        is_public=0|1
-    ; Config_panel
-        main.export.export=none|abiword|libreoffice
-        main.pad_configuration.pad_config_nocolors=1|0
-        main.pad_configuration.pad_config_showlinenumbers=0|1
-        main.pad_configuration.pad_config_chatandusers=1|0
-        main.pad_configuration.pad_config_alwaysshowchat=1|0
-        main.pad_configuration.pad_config_show_markdown=1|0
-        main.mypads_configuration.mypads=0|1
-        main.mypads_configuration.useldap=0|1
-        main.overwrite_files.overwrite_settings=0|1
-        main.overwrite_files.overwrite_credentials=0|1
-        main.overwrite_files.overwrite_nginx=0|1
-        main.overwrite_files.overwrite_systemd=0|1
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
@@ -36,16 +21,13 @@
 		upgrade=1	from_commit=4d613658f120a05537f11f6814cc28e09d74a3c8
 		backup_restore=1
 		multi_instance=1
-		port_already_use=0
 		change_url=1
-        actions=0
-        config_panel=0
 ;; Test sans MyPads
 	; Manifest
 		domain="domain.tld"
 		path="/path"
 		admin="john"
-		password="password"
+		password="1Strong-Password"
 		language="en"
 		is_public=1
 		export="libreoffice"
@@ -59,9 +41,9 @@
 ;; Test Abiword
 	; Manifest
 		domain="domain.tld"
-		path="/"
+		path="/path"
 		admin="john"
-		password="password"
+		password="1Strong-Password"
 		language="en"
 		is_public=1
 		export="abiword"
@@ -69,13 +51,14 @@
 		useldap=0
 	; Checks
 		setup_root=1
+		# 1.8.17~ynh1
 		upgrade=1	from_commit=4d613658f120a05537f11f6814cc28e09d74a3c8
 ;; Test sans export
 	; Manifest
 		domain="domain.tld"
 		path="/path"
 		admin="john"
-		password="password"
+		password="1Strong-Password"
 		language="en"
 		is_public=1
 		export="none"
diff --git a/conf/app.src b/conf/app.src
index 6f42fe9..51159f6 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.17.tar.gz
-SOURCE_SUM=3b51eb0259764669dedfb4d13cdbe8d4a2dea37735fe32941aac39b5def9f99b
+SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.18.tar.gz
+SOURCE_SUM=67ccc0bac94e146b26fbddcf8330e0f543a4ff82213c420a376644614a7ff2c4
 SOURCE_SUM_PRG=sha256sum
 ARCH_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index d7a67c1..00c6dfb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,13 +6,13 @@
         "en": "Online editor providing collaborative editing in real-time",
         "fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel"
     },
-    "version": "1.8.17~ynh2",
+    "version": "1.8.18~ynh1",
     "url": "http://etherpad.org",
     "upstream": {
         "license": "Apache-2.0",
         "website": "http://etherpad.org",
         "demo": "https://video.etherpad.com",
-        "admindoc": "http://etherpad.org/doc/v1.8.17",
+        "admindoc": "http://etherpad.org/doc/v1.8.18",
         "code": "https://github.com/ether/etherpad-lite"
     },
     "license": "Apache-2.0",
diff --git a/scripts/install b/scripts/install
index 9a09575..d0db0b6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -115,6 +115,7 @@ db_name=$(ynh_sanitize_dbid --db_name=$app)
 db_user=$db_name
 ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
+
 echo "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" | ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name
 
 #=================================================
@@ -267,15 +268,15 @@ fi
 #=================================================
 # SETUP LOGROTATE
 #=================================================
-ynh_script_progression --message="Configuring log rotation..."
+ynh_script_progression --message="Configuring log rotation..." --weight=1
 
 # Use logrotate to manage application logfile(s)
-ynh_use_logrotate
+ynh_use_logrotate --specific_user=$app/$app
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
-ynh_script_progression --message="Integrating service in YunoHost..."
+ynh_script_progression --message="Integrating service in YunoHost..." --weight=2
 
 yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/etherpad.log"
 
@@ -323,7 +324,7 @@ ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin --aut
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server..."
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/upgrade b/scripts/upgrade
index c083ee5..e2a14e0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -366,12 +366,12 @@ pushd $final_path
 popd
 
 #=================================================
-# SOME HACKS
+# ADD MYPADS LINK
 #=================================================
 
 if [ "$upgrade_type" == "UPGRADE_APP" ] && [ $mypads -eq 1 ]
 then
-	# Find the /div just after the field to open a pad in order to add a link to mypads plugin.
+	# Find the /div just after the field to open a pad in order to add a link to MyPads plugin.
 	sed -i '157i<center><br><font size="4"><a href="./mypads/" style="text-decoration: none; color: #555">MyPads</a></font></center>' $final_path/src/templates/index.html
 fi