diff --git a/scripts/install b/scripts/install
index a6ce815..6b2e860 100755
--- a/scripts/install
+++ b/scripts/install
@@ -69,7 +69,6 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
-curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - 
 ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
 
 #=================================================
@@ -141,9 +140,9 @@ ynh_script_progression --message="Installing Misskey..." --weight=15
 
 pushd "$final_path"
 	ynh_use_nodejs
-	ynh_exec_warn_less yarn add ts-node webpack
-	ynh_exec_warn_less yarn build
-	ynh_exec_warn_less yarn run init
+	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn add ts-node webpack
+	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH NODE_ENV=production yarn build
+	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn run init
 popd
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 46cf416..b1093d4 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -117,7 +117,6 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
-curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - 
 ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
 
 #=================================================
@@ -125,10 +124,10 @@ ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ st
 #=================================================
 
 pushd "$final_path"
-	ynh_exec_warn_less yarn install
-	ynh_exec_warn_less yarn run clean
-	ynh_exec_warn_less yarn build
-	ynh_exec_warn_less yarn migrate
+	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install
+	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn run clean
+	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH NODE_ENV=production yarn build
+	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn migrate
 popd
 
 #=================================================