diff --git a/scripts/install b/scripts/install
index 5a328a7..7f874dd 100644
--- a/scripts/install
+++ b/scripts/install
@@ -50,7 +50,6 @@ ynh_config_add --template="config.inc.php" --destination="$install_dir/config/co
 ynh_script_progression "Installing additional plugins..."
 
 # Install net_LDAP
-export COMPOSER_ALLOW_SUPERUSER=1
 ynh_composer_exec require kolab/net_ldap3
 
 # Install contextmenu and automatic_addressbook plugins
@@ -108,13 +107,6 @@ fi
 ynh_script_progression "Updating Roundcube configuration..."
 
 ynh_replace --match="^\s*// installed plugins" --replace="&\n $installed_plugins" --file="$install_dir/config/config.inc.php"
-
-# Update javascript dependencies
-# (REMOVEME? -> already done in the -complete.tar.gz archive)
-#(cd "$install_dir"
-#/usr/bin/php$php_version -q ./bin/install-jsdeps.sh -v ?)
-
-# Store the config file checksum into the app settings
 ynh_store_file_checksum "$install_dir/config/config.inc.php"
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 0ddb7ee..16823e9 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -123,19 +123,16 @@ ynh_replace --match="^\s*// installed plugins" --replace="&\n $installed_plugins
 
 # Update JavaScript dependencies
 pushd "$install_dir"
-    COMPOSER_ALLOW_SUPERUSER=1 "php$php_version" ./bin/update.sh --version="?" -y <<< ""
+    export COMPOSER_HOME="$install_dir/.composer"
+    ynh_exec_as_app "php$php_version" ./bin/update.sh --version="?" -y <<< ""
 
-    # Store the config file checksum into the app settings
-    ynh_store_file_checksum "$install_dir/config/config.inc.php"
-
-    #=================================================
-    # UPDATE ROUNDCUBE CORE
-    #=================================================
     ynh_script_progression "Updating $app core..."
-
-    COMPOSER_ALLOW_SUPERUSER=1 ynh_exec_warn "php$php_version" ./bin/update.sh --version=$oldversion -y
+    ynh_exec_as_app "php$php_version" ./bin/update.sh --version=$oldversion -y
 popd
 
+# Store the config file checksum into the app settings
+ynh_store_file_checksum "$install_dir/config/config.inc.php"
+
 #=================================================
 # END OF SCRIPT
 #=================================================