diff --git a/scripts/restore b/scripts/restore
index 4ac6360..683657e 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -1,16 +1,14 @@
 #!/bin/bash
 set -eu
 
+#=================================================
+# GENERIC START
 #=================================================
 # IMPORT GENERIC HELPERS
 #=================================================
-if [ ! -e _common.sh ]; then
-	# Fetch helpers file if not in current directory
-	sudo cp ../settings/scripts/_common.sh ./_common.sh
-	sudo chmod a+rx _common.sh
-fi
+
+source ./_common.sh
 source /usr/share/yunohost/helpers
-source _common.sh
 
 #=================================================
 # GENERIC START
diff --git a/scripts/upgrade b/scripts/upgrade
index 5b42f7c..38e5ed1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -18,14 +18,6 @@ serviceuser=$(ynh_app_setting_get $app serviceuser)
 path=$(ynh_app_setting_get $app path)
 port=$(ynh_app_setting_get $app port)
 
-sudo systemctl stop rocketchat
-
-sudo rm -rf $final_path
-sudo mkdir -p $final_path
-
-# update to latest required node setup
-installnode
-
 # download and extract rocketchat
 echo "Downloading rocket.chat-$ROCKETCHAT_VERSION.gtar from ${ROCKETCHAT_DOWNLOAD_URI}."
 sudo curl -s -L -o $final_path/rocket.chat-$ROCKETCHAT_VERSION.gtar "${ROCKETCHAT_DOWNLOAD_URI}"
@@ -34,6 +26,14 @@ if [[ ! "$SHA_DOWNLOAD" == "$ROCKETCHAT_SHASUM" ]]; then
   ynh_die "The sha256sum does not match the configured one"
 fi
 
+sudo systemctl stop rocketchat
+
+sudo rm -rf $final_path
+sudo mkdir -p $final_path
+
+# update to latest required node setup
+installnode
+
 sudo tar -xzf $final_path/rocket.chat-$ROCKETCHAT_VERSION.gtar -C $final_path --strip-components=1 bundle
 sudo rm $final_path/rocket.chat-$ROCKETCHAT_VERSION.gtar