diff --git a/scripts/install b/scripts/install
index d330c55..b4f3260 100755
--- a/scripts/install
+++ b/scripts/install
@@ -140,7 +140,7 @@ pushd "$final_path"
 	corepack enable
 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --frozen-lockfile
 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run init
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm init
 popd
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 708bb31..3e907d1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -107,6 +107,11 @@ then
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path" --keep=".config/default.yml"
+		pushd "$final_path"
+		git checkout master
+		git pull --quiet
+		git submodule update --init --quiet
+	popd
 fi
 
 chmod 750 "$final_path"
@@ -136,10 +141,10 @@ ynh_script_progression --message="Building app..."
 
 pushd "$final_path"
     ynh_use_nodejs
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run clean-all
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm install --frozen-lockfile
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run build
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run migrate
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm clean-all
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --frozen-lockfile
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm migrate
 popd
 
 #=================================================