diff --git a/scripts/restore b/scripts/restore
index 5443a51..dec00f8 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -38,8 +38,8 @@ ynh_script_progression --message="Reinstalling PNPM..." --weight=1
 # Define and install pnpm
 pushd "$install_dir"	
 	ynh_use_nodejs
-	corepack enable
-	corepack prepare pnpm@latest --activate
+	env $ynh_node_load_PATH corepack enable
+	env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
 	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
 popd
diff --git a/scripts/upgrade b/scripts/upgrade
index 606e72c..851d4fa 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -64,9 +64,8 @@ ynh_script_progression --message="Building app..."
 
 pushd "$install_dir"
     ynh_use_nodejs
-    env $ynh_node_load_PATH corepack enable
-    env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare --activate
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm cleanall
+	env $ynh_node_load_PATH corepack enable
+	env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
     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