diff --git a/README.md b/README.md
index aced0a8..b7e1bcd 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**Shipped version:** 2.1.0~ynh1
+**Shipped version:** 2.1.0~ynh2
 
 **Demo:** <https://video.etherpad.com/>
 
diff --git a/README_es.md b/README_es.md
index d101b2e..018271b 100644
--- a/README_es.md
+++ b/README_es.md
@@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**Versión actual:** 2.1.0~ynh1
+**Versión actual:** 2.1.0~ynh2
 
 **Demo:** <https://video.etherpad.com/>
 
diff --git a/README_eu.md b/README_eu.md
index 3b188d8..a6793c9 100644
--- a/README_eu.md
+++ b/README_eu.md
@@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**Paketatutako bertsioa:** 2.1.0~ynh1
+**Paketatutako bertsioa:** 2.1.0~ynh2
 
 **Demoa:** <https://video.etherpad.com/>
 
diff --git a/README_fr.md b/README_fr.md
index b7c03eb..c56ba98 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -22,7 +22,7 @@ Attention, la sauvegarde et la restauration de la base de données Redis ne sont
 Si vous souhaitez installer Etherpad avec les plugins et la base de données mysql : https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**Version incluse :** 2.1.0~ynh1
+**Version incluse :** 2.1.0~ynh2
 
 **Démo :** <https://video.etherpad.com/>
 
diff --git a/README_gl.md b/README_gl.md
index 5a42d01..b71d710 100644
--- a/README_gl.md
+++ b/README_gl.md
@@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**Versión proporcionada:** 2.1.0~ynh1
+**Versión proporcionada:** 2.1.0~ynh2
 
 **Demo:** <https://video.etherpad.com/>
 
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
index 607540e..52edbf5 100644
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**分发版本：** 2.1.0~ynh1
+**分发版本：** 2.1.0~ynh2
 
 **演示：** <https://video.etherpad.com/>
 
diff --git a/conf/systemd.service b/conf/systemd.service
index 559f1e1..39c863b 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -7,11 +7,10 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
-Environment=ETHERPAD_PRODUCTION=true
+Environment="ETHERPAD_PRODUCTION=true"
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
 ExecStart=__INSTALL_DIR__/bin/run.sh
-#ExecStart=pnpm run prod
 Restart=always
 
 # Sandboxing options to harden security
diff --git a/doc/PRE_INSTALL.md b/doc/PRE_INSTALL.md
index 01d67e0..a299eb4 100644
--- a/doc/PRE_INSTALL.md
+++ b/doc/PRE_INSTALL.md
@@ -1 +1 @@
-Please note, this package is only intended to test Etherpad with redis database. It should not be used for production.
\ No newline at end of file
+Please note, this package is only intended to test Etherpad with Redis database. It should not be used for production.
\ No newline at end of file
diff --git a/manifest.toml b/manifest.toml
index 951e097..c910003 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Etherpad"
 description.en = "Collaborative editing in real-time"
 description.fr = "Édition collaborative en temps réel"
 
-version = "2.1.0~ynh1"
+version = "2.1.0~ynh2"
 
 maintainers = ["eric_G"]
 
@@ -17,7 +17,7 @@ admindoc = "https://etherpad.org/doc/v2.0.2/"
 code = "https://github.com/ether/etherpad-lite"
 
 [integration]
-yunohost = ">= 11.2.12"
+yunohost = ">= 11.2.14"
 architectures = "all"
 multi_instance = true
 
diff --git a/scripts/backup b/scripts/backup
index 312b053..e21c492 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -21,23 +21,13 @@ ynh_print_info --message="Declaring files to be backed up..."
 ynh_backup --src_path="$install_dir"
 
 #=================================================
-# BACKUP THE NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# SPECIFIC BACKUP
-#=================================================
-# BACKUP LOGROTATE
-#=================================================
-
 ynh_backup --src_path="/etc/logrotate.d/$app"
 
-#=================================================
-# BACKUP SYSTEMD
-#=================================================
-
 ynh_backup --src_path="/etc/systemd/system/$app.service"
 
 #=================================================
diff --git a/scripts/install b/scripts/install
index 62ec041..344dcc8 100644
--- a/scripts/install
+++ b/scripts/install
@@ -17,7 +17,7 @@ ynh_script_progression --message="Installing dependencies..." --weight=6
 ynh_install_nodejs --nodejs_version=$nodejs_version
 
 #=================================================
-# CREATE A POSTQRESQL DATABASE
+# CREATE REDIS DATABASE
 #=================================================
 ynh_script_progression --message="Creating a Redis database..." --weight=5
 
@@ -36,9 +36,9 @@ chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
 #=================================================
-# SETUP SYSTEMD
+# SYSTEM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring a systemd service..." --weight=4
+ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
 
 ynh_add_systemd_config
 
@@ -49,9 +49,9 @@ ynh_use_logrotate
 yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/$app.log"
 
 #=================================================
-# MODIFY A CONFIG FILE
+# APP INITIAL CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring $app..." --weight=6
+ynh_script_progression --message="Adding $app's configuration files..." --weight=1
 
 abiword_path="null"
 soffice_path="null"
@@ -80,8 +80,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
     ynh_use_nodejs
-    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable
-    ynh_exec_warn_less env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
+    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
     ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
 popd
 
diff --git a/scripts/restore b/scripts/restore
index 52de706..1c79226 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -32,15 +32,15 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=7
 
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
-pushd $install_dir
- 	ynh_use_nodejs
-    ynh_exec_warn_less npm install pnpm -g
+pushd "$install_dir"
+    ynh_use_nodejs
+    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
 popd
 
 #=================================================
-# RESTORE SYSTEMD
+# RESTORE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Restoring the systemd configuration..." --weight=8
+ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
 
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable $app.service --quiet
diff --git a/scripts/upgrade b/scripts/upgrade
index 0335593..ac5a20f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -101,9 +101,8 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
  	ynh_use_nodejs
-    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable
-    ynh_exec_warn_less env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
- 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
+    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
+ 	ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
 popd
 
 #=================================================