diff --git a/scripts/upgrade b/scripts/upgrade
index 8e75255..2e3f7ec 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -176,23 +176,34 @@ ynh_install_app_dependencies $pkg_dependencies
 # VERSION TO THE NEXT ONE
 #=================================================
 
+# Define a function to execute commands with `occ`
+exec_occ() {
+(cd "$final_path" && exec_as "$app" \
+    php occ --no-interaction --no-ansi "$@")
+}
+
+# Define a function to add an external storage
+# Create the external storage for the given folders and enable sharing
+create_external_storage() {
+local datadir="$1"
+local mount_name="$2"
+local mount_id=`exec_occ files_external:create --output=json \
+    "$mount_name" 'local' 'null::null' -c "datadir=$datadir" || true`
+! [[ $mount_id =~ ^[0-9]+$ ]] \
+    && ynh_print_warn --message="Unable to create external storage" \
+    || exec_occ files_external:option "$mount_id" enable_sharing true
+}
+# Define app's data directory
+datadir="/home/yunohost.app/$app/data"
+
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
     ynh_script_progression --message="Upgrading nextcloud..." --weight=3
 
-    # Define a function to execute commands with `occ`
-    exec_occ() {
-    (cd "$final_path" && exec_as "$app" \
-        php occ --no-interaction --no-ansi "$@")
-    }
-
     # Load the last available version
     source upgrade.d/upgrade.last.sh
     last_version=$next_version
 
-    # Define app's data directory
-    datadir="/home/yunohost.app/$app/data"
-
     # Set write access for the following commands
     chown -R $app: "$final_path" "$datadir"
 
@@ -323,18 +334,6 @@ then
     # MOUNT HOME FOLDERS AS EXTERNAL STORAGE
     #=================================================
 
-    # Define a function to add an external storage
-    # Create the external storage for the given folders and enable sharing
-    create_external_storage() {
-    local datadir="$1"
-    local mount_name="$2"
-    local mount_id=`exec_occ files_external:create --output=json \
-        "$mount_name" 'local' 'null::null' -c "datadir=$datadir" || true`
-    ! [[ $mount_id =~ ^[0-9]+$ ]] \
-        && ynh_print_warn --message="Unable to create external storage" \
-        || exec_occ files_external:option "$mount_id" enable_sharing true
-    }
-
     # Enable External Storage and create local mount to home folder as needed
     if [ $user_home -eq 1 ]; then
         exec_occ app:enable files_external