diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service
index 73f29e5..a4fc0da 100644
--- a/conf/mastodon-sidekiq.service
+++ b/conf/mastodon-sidekiq.service
@@ -9,7 +9,7 @@
  Environment="RAILS_ENV=production"
  Environment="DB_POOL=25"
  Environment="MALLOC_ARENA_MAX=2"
- ExecStart=__RBENVROOT__/shims/bundle exec sidekiq -c 25
+ ExecStart=__RBENV_ROOT__/shims/bundle exec sidekiq -c 25
  TimeoutSec=15
  Restart=always
  StandardError=syslog
diff --git a/conf/mastodon-streaming.service b/conf/mastodon-streaming.service
index 2e130d5..94309c1 100644
--- a/conf/mastodon-streaming.service
+++ b/conf/mastodon-streaming.service
@@ -9,8 +9,8 @@
  Environment="NODE_ENV=production"
  Environment="PORT=__PORT_STREAM__"
  Environment="STREAMING_CLUSTER_NUM=1"
- Environment=PATH=__NODEJS_PATH__
- ExecStart=__NODEJS_PATH__/node ./streaming
+ Environment=__YNH_LOAD_NODE_PATH__
+ ExecStart=__YNH_NODE__ ./streaming
  TimeoutSec=15
  Restart=always
  StandardError=syslog
diff --git a/conf/mastodon-web.service b/conf/mastodon-web.service
index 14d1260..bb07cf4 100644
--- a/conf/mastodon-web.service
+++ b/conf/mastodon-web.service
@@ -8,7 +8,7 @@
  WorkingDirectory=__FINALPATH__/live
  Environment="RAILS_ENV=production"
  Environment="PORT=__PORT_WEB__"
- ExecStart=__RBENVROOT__/shims/bundle exec puma -C config/puma.rb
+ ExecStart=__RBENV_ROOT__/shims/bundle exec puma -C config/puma.rb
  ExecReload=/bin/kill -SIGUSR1 $MAINPID
  TimeoutSec=15
  Restart=always
diff --git a/manifest.json b/manifest.json
index 9041ab7..a6dbf25 100644
--- a/manifest.json
+++ b/manifest.json
@@ -23,7 +23,7 @@
         }
     ],
     "requirements": {
-        "yunohost": ">= 3.8.1"
+        "yunohost": ">= 3.8.2"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/install b/scripts/install
index ebc4173..53b598b 100644
--- a/scripts/install
+++ b/scripts/install
@@ -230,14 +230,9 @@ cp -f ../conf/cron /etc/cron.d/$app
 ynh_script_progression --message="Configuring a systemd service..."
 
 # Create a dedicated systemd config
-ynh_replace_string --match_string="__PORT_WEB__" --replace_string="$port_web" --target_file="../conf/mastodon-web.service"
-ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/mastodon-web.service"
-ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/mastodon-sidekiq.service"
-ynh_replace_string --match_string="__PORT_STREAM__" --replace_string="$port_stream" --target_file="../conf/mastodon-streaming.service"
-ynh_replace_string --match_string="__NODEJS_PATH__" --replace_string="$nodejs_path" --target_file="../conf/mastodon-streaming.service"
-ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service"
-ynh_add_systemd_config --service="$app-sidekiq" --template="mastodon-sidekiq.service"
-ynh_add_systemd_config --service="$app-streaming" --template="mastodon-streaming.service"
+ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service" --others_var="port_web RBENV_ROOT"
+ynh_add_systemd_config --service="$app-sidekiq" --template="mastodon-sidekiq.service" --others_var="RBENV_ROOT"
+ynh_add_systemd_config --service="$app-streaming" --template="mastodon-streaming.service" --others_var="port_stream ynh_node_load_PATH ynh_node"
 
 #=================================================
 # STORE THE CONFIG FILE CHECKSUM
diff --git a/scripts/upgrade b/scripts/upgrade
index 8441307..6445cc8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -313,14 +313,9 @@ cp -f ../conf/cron /etc/cron.d/$app
 ynh_script_progression --message="Upgrading systemd configuration..."
 
 # Create a dedicated systemd config
-ynh_replace_string --match_string="__PORT_WEB__" --replace_string="$port_web" --target_file="../conf/mastodon-web.service"
-ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/mastodon-web.service"
-ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/mastodon-sidekiq.service"
-ynh_replace_string --match_string="__PORT_STREAM__" --replace_string="$port_stream" --target_file="../conf/mastodon-streaming.service"
-ynh_replace_string --match_string="__NODEJS_PATH__" --replace_string="$nodejs_path" --target_file="../conf/mastodon-streaming.service"
-ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service"
-ynh_add_systemd_config --service="$app-sidekiq" --template="mastodon-sidekiq.service"
-ynh_add_systemd_config --service="$app-streaming" --template="mastodon-streaming.service"
+ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service" --others_var="port_web RBENV_ROOT"
+ynh_add_systemd_config --service="$app-sidekiq" --template="mastodon-sidekiq.service" --others_var="RBENV_ROOT"
+ynh_add_systemd_config --service="$app-streaming" --template="mastodon-streaming.service" --others_var="port_stream ynh_node_load_PATH ynh_node"
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST