diff --git a/README.md b/README.md
index a2b70e9..477ed83 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ A safe and private place for your life's work.
 
 Standard Notes is a simple and private notes app available on most platforms, including Web, Mac, Windows, Linux, iOS, and Android. It focuses on simplicity, and encrypts data locally before it ever touches a cloud. This means no one can read your notes but you (not even us).
 
-**Shipped version:** 3.5.11
+**Shipped version:** 3.6.2
 * Apps available for free. https://standardnotes.org/ 
 * Desktop (Windows, Mac, Linux)
 * Mobile (Android and iOS)
diff --git a/check_process b/check_process
index b6aa055..6bccdfe 100644
--- a/check_process
+++ b/check_process
@@ -15,7 +15,8 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=0	from_commit=
+		# 3.5.11~ynh1
+		upgrade=1	from_commit=2c82b25537bc09b99c1daeced8ca38fe9b1bae8b
 		backup_restore=1
 		multi_instance=1
 		# This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version.
@@ -29,7 +30,7 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=
-		name=
+	; commit=2c82b25537bc09b99c1daeced8ca38fe9b1bae8b
+		name=3.5.11~ynh1
 		manifest_arg=domain=DOMAIN&is_public=1
 
diff --git a/conf/systemd.service b/conf/systemd.service
index 56056de..0a72659 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -7,7 +7,6 @@ Type=simple
 User=__APP__
 Group=__APP__
 EnvironmentFile=__FINALPATH__/live/.env
-Environment=__ENV_PATH__
 WorkingDirectory=__FINALPATH__/live/
 ExecStart=/opt/rbenv/versions/__RUBY_VERSION__/bin/bundle exec puma -C config/puma.rb -p __PORT__ -e production
 StandardOutput=append:/var/log/__APP__/snweb.log
diff --git a/manifest.json b/manifest.json
index d9082a2..58bc1a4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,21 +5,19 @@
     "description": {
         "en": "The Standard Notes Web App. An end-to-end encrypted note-taking app. Web, Mac, Windows, Linux, iOS, and Android."
     },
-    "version": "3.5.11~ynh1",
+    "version": "3.6.2~ynh1",
     "url": "https://github.com/standardnotes/web",
-    "license": "free",
+    "license": "AGPL-3.0-or-later",
     "maintainer": {
         "name": "Fabian Wilkens",
-        "email": "wilkens.fabian+github@gmail.com",
-        "url": "https://github.com/FabianWilkens/snweb_ynh"
+        "email": "46000361+FabianWilkens@users.noreply.github.com"
     },
     "requirements": {
         "yunohost": ">= 4.0"
     },
     "multi_instance": true,
     "services": [
-        "nginx",
-        "mysql"
+        "nginx"
     ],
     "arguments": {
         "install" : [
diff --git a/scripts/_common.sh b/scripts/_common.sh
index a8d6156..bb24840 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -13,10 +13,10 @@ pkg_dependencies="\
         "
 
 RUBY_VERSION="2.7.2"
-NODEJS_VERSION="10"
+NODEJS_VERSION="15.11.0"
 
 SOURCE="https://github.com/standardnotes/web"
-COMMIT="31676f1cc61898147b363d442593870ae880d3e5"
+COMMIT="22da9ea942dbb9f7fe66af0bf43290b06b7fb482"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index 37974b6..768f0aa 100644
--- a/scripts/install
+++ b/scripts/install
@@ -142,11 +142,13 @@ chown -R $app: "$final_path"
 pushd "$final_path/live"
     git submodule update --init --recursive --quiet
     ynh_use_nodejs
-    exec_as $app $ENV_PATH $ynh_npm --loglevel=error ci
-    env PATH=$ENV_PATH /opt/rbenv/versions/$RUBY_VERSION/bin/gem install bundler --quiet
-    env PATH=$ENV_PATH /opt/rbenv/versions/$RUBY_VERSION/bin/bundler install --quiet
-    exec_as $app $ENV_PATH $ynh_npm --loglevel=error run bundle
-    exec_as $app $ENV_PATH /opt/rbenv/versions/$RUBY_VERSION/bin/bundle exec rails assets:precompile --quiet
+    /opt/rbenv/versions/$RUBY_VERSION/bin/gem install bundler --quiet
+    /opt/rbenv/versions/$RUBY_VERSION/bin/bundler install --quiet
+    exec_as $app /opt/rbenv/versions/$RUBY_VERSION/bin/bundle config set --local path 'vendor/bundle'
+    exec_as $app /opt/rbenv/versions/$RUBY_VERSION/bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet
+    exec_as $app $ENV_PATH yarn install --pure-lockfile
+    exec_as $app $ENV_PATH yarn bundle
+    exec_as $app /opt/rbenv/versions/$RUBY_VERSION/bin/bundle exec rails assets:precompile --quiet
 popd
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 9000816..f1dc252 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -103,11 +103,13 @@ chown -R $app: "$final_path"
 pushd "$final_path/live"
     git submodule update --init --recursive --quiet
     ynh_use_nodejs
-    exec_as $app $ENV_PATH $ynh_npm --loglevel=error ci
-    env PATH=$ENV_PATH /opt/rbenv/versions/$RUBY_VERSION/bin/gem install bundler --quiet
-    env PATH=$ENV_PATH /opt/rbenv/versions/$RUBY_VERSION/bin/bundler install --quiet
-    exec_as $app $ENV_PATH $ynh_npm --loglevel=error run bundle
-    exec_as $app $ENV_PATH /opt/rbenv/versions/$RUBY_VERSION/bin/bundle exec rails assets:precompile --quiet
+    /opt/rbenv/versions/$RUBY_VERSION/bin/gem install bundler --quiet
+    /opt/rbenv/versions/$RUBY_VERSION/bin/bundler install --quiet
+    exec_as $app /opt/rbenv/versions/$RUBY_VERSION/bin/bundle config set --local path 'vendor/bundle'
+    exec_as $app /opt/rbenv/versions/$RUBY_VERSION/bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet
+    exec_as $app $ENV_PATH yarn install --pure-lockfile
+    exec_as $app $ENV_PATH yarn bundle
+    exec_as $app /opt/rbenv/versions/$RUBY_VERSION/bin/bundle exec rails assets:precompile --quiet
 popd
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 6640ad7..4c7ae9c 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -173,11 +173,13 @@ then
     pushd "$final_path/live"
         git submodule update --init --recursive --quiet
         ynh_use_nodejs
-        exec_as $app $ENV_PATH $ynh_npm --loglevel=error ci
-        env PATH=$ENV_PATH /opt/rbenv/versions/$RUBY_VERSION/bin/gem install bundler --quiet
-        env PATH=$ENV_PATH /opt/rbenv/versions/$RUBY_VERSION/bin/bundler install --quiet
-        exec_as $app $ENV_PATH $ynh_npm --loglevel=error run bundle
-        exec_as $app $ENV_PATH /opt/rbenv/versions/$RUBY_VERSION/bin/bundle exec rails assets:precompile --quiet
+        /opt/rbenv/versions/$RUBY_VERSION/bin/gem install bundler --quiet
+        /opt/rbenv/versions/$RUBY_VERSION/bin/bundler install --quiet
+        exec_as $app /opt/rbenv/versions/$RUBY_VERSION/bin/bundle config set --local path 'vendor/bundle'
+        exec_as $app /opt/rbenv/versions/$RUBY_VERSION/bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet
+        exec_as $app $ENV_PATH yarn install --pure-lockfile
+        exec_as $app $ENV_PATH yarn bundle
+        exec_as $app /opt/rbenv/versions/$RUBY_VERSION/bin/bundle exec rails assets:precompile --quiet
     popd
 fi