diff --git a/scripts/_common.sh b/scripts/_common.sh
index c191e21..6d12583 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -13,5 +13,107 @@ automatic_addressbook_version=v0.4.3
 carddav_version=5.0.1
 
 #=================================================
-# EXPERIMENTAL HELPERS
+# DEFINE ALL COMMON FONCTIONS
 #=================================================
+
+install_roundcube_with_plugins() {
+
+	#=================================================
+	# INSTALL AND INITIALIZE COMPOSER
+	#=================================================
+	ynh_script_progression --message="Installing Roundcube with Composer..." --weight=30
+
+	# Install composer.json
+	cp "$install_dir/composer.json-dist" "$install_dir/composer.json"
+
+	# Install composer
+	ynh_install_composer
+
+	#=================================================
+	# CONFIGURE ROUNDCUBE
+	#=================================================
+	ynh_script_progression --message="Configuring Roundcube..." --weight=2
+
+	deskey=$(ynh_string_random --length=24)
+	ynh_add_config --template="../conf/config.inc.php" --destination="$install_dir/config/config.inc.php"
+
+	#=================================================
+	# INSTALL ADDITIONAL PLUGINS
+	#=================================================
+	ynh_script_progression --message="Installing additional plugins..." --weight=60
+
+	# Create logs and temp directories
+	mkdir -p "$install_dir/"{logs,temp}
+
+	# Install net_LDAP
+	export COMPOSER_ALLOW_SUPERUSER=1
+	ynh_composer_exec --commands="require kolab/net_ldap3"
+
+	# Install contextmenu and automatic_addressbook plugins
+	# https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook
+	# https://plugins.roundcube.net/packages/johndoh/contextmenu
+	ynh_composer_exec --commands="require \
+	    johndoh/contextmenu $contextmenu_version \
+	    sblaisot/automatic_addressbook $automatic_addressbook_version"
+
+	installed_plugins+=" 'contextmenu', 'automatic_addressbook',"
+
+	ynh_add_config --template="../conf/enigma.config.inc.php" --destination="$install_dir/plugins/enigma/config.inc.php"
+	mkdir -p "$install_dir/plugins/enigma/home"
+	chown -R $app:www-data "$install_dir/plugins/enigma/home"
+
+	# Install CardDAV plugin
+	if [ $with_carddav -eq 1 ]
+	then
+	    ynh_composer_exec --commands="require roundcube/carddav $carddav_version --with-all-dependencies"
+
+	    carddav_tmp_config="../conf/carddav.config.inc.php"
+	    carddav_server=0
+
+	    # Copy the plugin configuration file
+	    cp $install_dir/plugins/carddav/config.inc.php{.dist,}
+
+	    # Look for installed and supported CardDAV servers
+	    for carddav_app in "nextcloud" "baikal"
+	    do
+		carddav_app_ids=$(yunohost app list | grep "id: $carddav_app" | grep -Po 'id: \K(.*)' || echo "")
+		for carddav_app_id in $carddav_app_ids
+		do
+		    carddav_server=1
+		    # Append preset configuration to the config file
+		    cat "../conf/${carddav_app}.inc.php" >> $install_dir/plugins/carddav/config.inc.php
+		    # Retrieve app settings and enable relevant preset
+		    carddav_domain=$(ynh_app_setting_get --app=$carddav_app_id --key=domain)
+		    carddav_path=$(ynh_app_setting_get --app=$carddav_app_id --key=path)
+		    carddav_url="https://${carddav_domain}${carddav_path%/}"
+		    ynh_replace_string --match_string="{${carddav_app}_id}" --replace_string="$carddav_app_id" --target_file="$install_dir/plugins/carddav/config.inc.php"
+		    ynh_replace_string --match_string="{${carddav_app}_url}" --replace_string="$carddav_url" --target_file="$install_dir/plugins/carddav/config.inc.php"
+		done
+	    done
+
+	    # Do not actualy add the cardDAV plugin if there's no cardDAV server available...
+	    if [ $carddav_server -eq 1 ]
+	    then
+		installed_plugins+=" 'carddav',"
+	    fi
+	fi
+
+	#=================================================
+	# UPDATE ROUNDCUBE CONFIGURATION
+	#=================================================
+	ynh_script_progression --message="Updating Roundcube configuration..." --weight=3
+
+	ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="&\n $installed_plugins" --target_file="$install_dir/config/config.inc.php"
+	    
+	# Store the config file checksum into the app settings
+	ynh_store_file_checksum --file="$install_dir/config/config.inc.php"
+
+	chmod 400 "$install_dir/config/config.inc.php"
+	chown $app:$app "$install_dir/config/config.inc.php"
+
+	# Update javascript dependencies
+	(cd "$install_dir"
+	  /usr/bin/php$phpversion -q ./bin/install-jsdeps.sh -v ?)
+	    
+}
+
diff --git a/scripts/install b/scripts/install
index 25ac65e..e555d2f 100644
--- a/scripts/install
+++ b/scripts/install
@@ -48,19 +48,6 @@ ynh_add_nginx_config
 # Create a dedicated php-fpm config
 ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 
-#=================================================
-# SPECIFIC SETUP
-#=================================================
-# INSTALL AND INITIALIZE COMPOSER
-#=================================================
-ynh_script_progression --message="Installing Roundcube with Composer..." --weight=30
-
-# Install composer.json
-cp "$install_dir/composer.json-dist" "$install_dir/composer.json"
-
-# Install composer
-ynh_install_composer
-
 #=================================================
 # INITIALIZE DATABASE
 #=================================================
@@ -69,93 +56,8 @@ ynh_script_progression --message="Initializing database..." --weight=3
 ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" < "$install_dir/SQL/mysql.initial.sql"
 
 #=================================================
-# CONFIGURE ROUNDCUBE
-#=================================================
-ynh_script_progression --message="Configuring Roundcube..." --weight=2
-
-deskey=$(ynh_string_random --length=24)
-ynh_add_config --template="../conf/config.inc.php" --destination="$install_dir/config/config.inc.php"
-
-#=================================================
-# INSTALL ADDITIONAL PLUGINS
-#=================================================
-ynh_script_progression --message="Installing additional plugins..." --weight=60
-
-# Create logs and temp directories
-mkdir -p "$install_dir/"{logs,temp}
-
-# Install net_LDAP
-export COMPOSER_ALLOW_SUPERUSER=1
-ynh_composer_exec --commands="require kolab/net_ldap3"
-
-# Install contextmenu and automatic_addressbook plugins
-# https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook
-# https://plugins.roundcube.net/packages/johndoh/contextmenu
-ynh_composer_exec --commands="require \
-    johndoh/contextmenu $contextmenu_version \
-    sblaisot/automatic_addressbook $automatic_addressbook_version"
-
-installed_plugins+=" 'contextmenu', 'automatic_addressbook',"
-
-ynh_add_config --template="../conf/enigma.config.inc.php" --destination="$install_dir/plugins/enigma/config.inc.php"
-mkdir -p "$install_dir/plugins/enigma/home"
-chown -R $app:www-data "$install_dir/plugins/enigma/home"
-
-# Install CardDAV plugin
-if [ $with_carddav -eq 1 ]
-then
-    ynh_composer_exec --commands="require roundcube/carddav $carddav_version --with-all-dependencies"
-
-    carddav_tmp_config="../conf/carddav.config.inc.php"
-    carddav_server=0
-
-    # Copy the plugin configuration file
-    cp $install_dir/plugins/carddav/config.inc.php{.dist,}
-
-    # Look for installed and supported CardDAV servers
-    for carddav_app in "nextcloud" "baikal"
-    do
-        carddav_app_ids=$(yunohost app list | grep "id: $carddav_app" | grep -Po 'id: \K(.*)' || echo "")
-        for carddav_app_id in $carddav_app_ids
-        do
-            carddav_server=1
-            # Append preset configuration to the config file
-            cat "../conf/${carddav_app}.inc.php" >> $install_dir/plugins/carddav/config.inc.php
-            # Retrieve app settings and enable relevant preset
-            carddav_domain=$(ynh_app_setting_get --app=$carddav_app_id --key=domain)
-            carddav_path=$(ynh_app_setting_get --app=$carddav_app_id --key=path)
-            carddav_url="https://${carddav_domain}${carddav_path%/}"
-            ynh_replace_string --match_string="{${carddav_app}_id}" --replace_string="$carddav_app_id" --target_file="$install_dir/plugins/carddav/config.inc.php"
-            ynh_replace_string --match_string="{${carddav_app}_url}" --replace_string="$carddav_url" --target_file="$install_dir/plugins/carddav/config.inc.php"
-        done
-    done
-
-    # Do not actualy add the cardDAV plugin if there's no cardDAV server available...
-    if [ $carddav_server -eq 1 ]
-    then
-        installed_plugins+=" 'carddav',"
-    fi
-fi
-
-#=================================================
-# UPDATE ROUNDCUBE CONFIGURATION
-#=================================================
-ynh_script_progression --message="Updating Roundcube configuration..." --weight=3
-
-ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="&\n $installed_plugins" --target_file="$install_dir/config/config.inc.php"
-
-# Update javascript dependencies
-(cd "$install_dir"
-/usr/bin/php$phpversion -q ./bin/install-jsdeps.sh -v ?)
-
-# Store the config file checksum into the app settings
-ynh_store_file_checksum --file="$install_dir/config/config.inc.php"
-
-chmod 400 "$install_dir/config/config.inc.php"
-chown $app:$app "$install_dir/config/config.inc.php"
-
-#=================================================
-# END OF SCRIPT
+# INSTALL DEPENDENCIES AND PLUGINS
 #=================================================
+install_roundcube_with_plugins
 
 ynh_script_progression --message="Installation of $app completed" --last
diff --git a/scripts/upgrade b/scripts/upgrade
index c9be392..19f04a3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -94,116 +94,17 @@ ynh_add_nginx_config
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-    ynh_script_progression --message="Reconfiguring Roundcube..." --weight=1
 
-    deskey=$(ynh_string_random --length=24)
-    ynh_add_config --template="../conf/config.inc.php" --destination="$install_dir/config/config.inc.php"
+	install_roundcube_with_plugins
 
-    #=================================================
-    # UPDATE DEPENDENCIES WITH COMPOSER
-    #=================================================
-    ynh_script_progression --message="Updating dependencies with Composer..." --weight=30
-
-    # Upgrade composer itself
-    ynh_install_composer
-
-    # Check if dependencies need to be updated with Composer
-    if [ -f "$install_dir/composer.json" ]
-    then
-        ynh_exec_warn_less ynh_composer_exec --commands="update"
-        # Update plugin-installer for Composer version 2.0
-        ynh_exec_warn_less ynh_composer_exec --commands="require roundcube/plugin-installer:>=0.2.0"
-    else
-        # Install composer.json
-        cp "$install_dir/composer.json-dist" "$install_dir/composer.json"
-    fi
-
-    #=================================================
-    # UPGRADE ADDITIONAL PLUGINS
-    #=================================================
-    ynh_script_progression --message="Upgrading additional plugins..." --weight=30
-
-    # Create logs and temp directories
-    mkdir -p "$install_dir/"{logs,temp}
-
-    # Install net_LDAP
-    ynh_composer_exec --commands="require kolab/net_ldap3"
-
-    # Update or install contextmenu and automatic_addressbook plugins
-    # https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook
-    # https://plugins.roundcube.net/packages/johndoh/contextmenu
-    ynh_composer_exec --commands="update --no-dev --prefer-dist \
-        johndoh/contextmenu $contextmenu_version \
-        sblaisot/automatic_addressbook $automatic_addressbook_version"
-
-    installed_plugins+=" 'contextmenu', 'automatic_addressbook',"
-
-    ynh_add_config --template="../conf/enigma.config.inc.php" --destination="$install_dir/plugins/enigma/config.inc.php"
-    mkdir -p "$install_dir/plugins/enigma/home"
-    chown -R $app:$app "$install_dir/plugins/enigma/home"
-
-    # Update or install CardDAV plugin
-    if [ $with_carddav -eq 1 ]
-    then
-        ynh_composer_exec --commands="require roundcube/carddav $carddav_version --with-all-dependencies"
-
-        carddav_tmp_config="../conf/carddav.config.inc.php"
-        carddav_server=0
-
-        # Copy the plugin configuration file
-        cp $install_dir/plugins/carddav/config.inc.php{.dist,}
-
-        # Look for installed and supported CardDAV servers
-        for carddav_app in "nextcloud" "baikal"
-        do
-            carddav_app_ids=$(yunohost app list | grep "id: $carddav_app" | grep -Po 'id: \K(.*)' || echo "")
-            for carddav_app_id in $carddav_app_ids
-            do
-                carddav_server=1
-                # Append preset configuration to the config file
-                cat "../conf/${carddav_app}.inc.php" >> $install_dir/plugins/carddav/config.inc.php
-                # Retrieve app settings and enable relevant preset
-                carddav_domain=$(ynh_app_setting_get --app=$carddav_app_id --key=domain)
-                carddav_path=$(ynh_app_setting_get --app=$carddav_app_id --key=path)
-                carddav_url="https://${carddav_domain}${carddav_path%/}"
-                ynh_replace_string --match_string="{${carddav_app}_id}" --replace_string="$carddav_app_id" --target_file="$install_dir/plugins/carddav/config.inc.php"
-                ynh_replace_string --match_string="{${carddav_app}_url}" --replace_string="$carddav_url" --target_file="$install_dir/plugins/carddav/config.inc.php"
-            done
-        done
-
-        # Do not actually add the carddav plugin if there's no carddav server available...
-        if [ $carddav_server -eq 1 ]
-        then
-            installed_plugins+=" 'carddav',"
-        fi
-    fi
-
-    #=================================================
-    # UPDATE ROUNDCUBE CONFIGURATION
-    #=================================================
-    ynh_script_progression --message="Updating $app configuration..." --weight=4
-
-    ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="&\n $installed_plugins" --target_file="$install_dir/config/config.inc.php"
-
-    # Update JavaScript dependencies
-    pushd "$install_dir"
-    COMPOSER_ALLOW_SUPERUSER=1 "php$phpversion" ./bin/update.sh --version="?" -y <<< ""
-
-        # Store the config file checksum into the app settings
-        ynh_store_file_checksum --file="$install_dir/config/config.inc.php"
-
-        chmod 400 "$install_dir/config/config.inc.php"
-        chown $app:$app "$install_dir/config/config.inc.php"
-
-        #=================================================
-        # UPDATE ROUNDCUBE CORE
-        #=================================================
-        ynh_script_progression --message="Updating $app core..." --weight=4
-
-    COMPOSER_ALLOW_SUPERUSER=1 ynh_exec_warn "php$phpversion" ./bin/update.sh --version=$oldversion -y
-    popd
+	# Migrate roundcube database
+	pushd "$install_dir"
+	COMPOSER_ALLOW_SUPERUSER=1 ynh_exec_warn "php$phpversion" ./bin/update.sh --version=$oldversion -y
+	popd
 fi
 
+
+
 #=================================================
 # END OF SCRIPT
 #=================================================