diff --git a/README.md b/README.md
index 9fac1cd..e1328d9 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ In addition to Roundcube core features, the following are made available with th
 * Support for PGP encryption with Enigma plugin by default.
 
 
-**Shipped version:** 1.5.3~ynh1
+**Shipped version:** 1.6.0~ynh1
 
 **Demo:** https://demo.yunohost.org/webmail/
 
diff --git a/README_fr.md b/README_fr.md
index 10e27d1..6366152 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -28,7 +28,7 @@ En plus des fonctionnalités principales de Roundcube, les éléments suivants s
 * Prise en charge du chiffrement PGP avec le plugin Enigma installé par default.
 
 
-**Version incluse :** 1.5.3~ynh1
+**Version incluse :** 1.6.0~ynh1
 
 **Démo :** https://demo.yunohost.org/webmail/
 
diff --git a/conf/app.src b/conf/app.src
index ef45d37..3f7ef4e 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.5.3/roundcubemail-1.5.3.tar.gz
-SOURCE_SUM=22fdfa0f868fc478dfbb1dfa9bcd5fc91be981182334ca6079ad1ae03ac4c96e
+SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.6.0/roundcubemail-1.6.0-complete.tar.gz
+SOURCE_SUM=2409ccdfe2e465f086cb9fc18c88dfe0aaf6ccc23924564975061209921694ba
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/config.inc.php b/conf/config.inc.php
index b32544c..791ceab 100644
--- a/conf/config.inc.php
+++ b/conf/config.inc.php
@@ -41,7 +41,7 @@ $config['db_dsnw'] = 'mysql://__DB_NAME__:__DB_PWD__@localhost/__DB_NAME__';
 // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
 // %s - domain name after the '@' from e-mail address provided at login screen
 // For example %n = mail.domain.tld, %t = domain.tld
-$config['default_host'] = 'localhost';
+$config['imap_host'] = 'localhost:143';
 
 // SMTP server host (for sending mails).
 // Enter hostname with prefix ssl:// to use Implicit TLS, or use
@@ -55,10 +55,7 @@ $config['default_host'] = 'localhost';
 // For example %n = mail.domain.tld, %t = domain.tld
 // To specify different SMTP servers for different IMAP hosts provide an array
 // of IMAP host (no prefix or port) and SMTP server e.g. ['imap.example.com' => 'smtp.example.net']
-$config['smtp_server'] = 'tls://' . $main_domain;
-
-// SMTP port. Use 25 for cleartext, 465 for Implicit TLS, or 587 for STARTTLS (default)
-$config['smtp_port'] = 587;
+$config['smtp_host'] = 'tls://' . $main_domain;
 
 // SMTP username (if required) if you use %u as the username Roundcube
 // will use the current username for login
@@ -113,8 +110,7 @@ $config['enable_spellcheck'] = false;
 // Enable YunoHost users search in the address book.
 $config['ldap_public']['yunohost'] = array(
   'name' => 'YunoHost Users',
-  'hosts' => array('localhost'),
-  'port' => 389,
+  'hosts' => array('localhost:389'),
   'user_specific' => false,
   'base_dn' => 'ou=users,dc=yunohost,dc=org',
   'scope' => 'list',
diff --git a/manifest.json b/manifest.json
index 5ff2549..7fdc88c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Open Source Webmail software",
         "fr": "Webmail Open Source"
     },
-    "version": "1.5.3~ynh1",
+    "version": "1.6.0~ynh1",
     "url": "https://roundcube.net/",
     "upstream": {
         "license": "GPL-3.0-only",
@@ -26,7 +26,7 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.3-fpm",
+        "php8.0-fpm",
         "mysql"
     ],
     "arguments": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index ad483bc..970cf36 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.3"
+YNH_PHP_VERSION="8.0"
 
 # Package dependencies
 pkg_dependencies="php-pear php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-curl"
diff --git a/scripts/install b/scripts/install
index ebb8c65..8580532 100644
--- a/scripts/install
+++ b/scripts/install
@@ -203,7 +203,7 @@ ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="&
 
 # Update javascript dependencies
 (cd "$final_path"
-/usr/bin/php$phpversion -q ./bin/install-jsdeps.sh)
+/usr/bin/php$phpversion -q ./bin/update.sh -v ?)
 
 # Store the config file checksum into the app settings
 ynh_store_file_checksum --file="$final_path/config/config.inc.php"
diff --git a/scripts/restore b/scripts/restore
index 25c084d..1e028d3 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -38,16 +38,11 @@ fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=3
 
-test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
+test ! -d $final_path \
+	|| ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
@@ -67,6 +62,14 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Reinstalling dependencies..." --weight=1
+
+# Define and install dependencies
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
@@ -78,12 +81,11 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion
 
 #=================================================
-# REINSTALL DEPENDENCIES
+# RESTORE THE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --weight=1
+ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
 
-# Define and install dependencies
-ynh_install_app_dependencies $pkg_dependencies
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # SPECIFIC RESTORATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 1877b73..cbf0e91 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -255,7 +255,7 @@ then
 
     # Update JavaScript dependencies
     (cd "$final_path"
-    /usr/bin/php$phpversion -q ./bin/install-jsdeps.sh)
+    /usr/bin/php$phpversion -q ./bin/update.sh -v ?)
 
     # Store the config file checksum into the app settings
     ynh_store_file_checksum --file="$final_path/config/config.inc.php"