diff --git a/check_process b/check_process
index ce713f1..644d844 100644
--- a/check_process
+++ b/check_process
@@ -26,6 +26,8 @@
 		upgrade=1	from_commit=5a74f4033eafa657fcd32a9713cd77ba0f4f79c9
 		# 3.1.0~ynh2
 		upgrade=1	from_commit=1be4caaaf2787e614cd315ca8564573d4268032a
+		# 3.1.0~ynh5
+		upgrade=1	from_commit=343f2b80e0f3bddc87ad8ed143411a0920c21150
 		backup_restore=1
 		multi_instance=0
 		port_already_use=0
@@ -48,4 +50,6 @@ Notification=yes
 		name=3.0.1~ynh1
 	; commit=1be4caaaf2787e614cd315ca8564573d4268032a
 		name=3.1.0~ynh2
+	; commit=343f2b80e0f3bddc87ad8ed143411a0920c21150
+		name=3.1.0~ynh5
 		
\ No newline at end of file
diff --git a/conf/systemd.service b/conf/systemd.service
index 794068e..b2b50fb 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -8,8 +8,7 @@ Environment=NODE_ENV=production
 Environment=NODE_CONFIG_DIR=__FINALPATH__/config
 User=__APP__
 Group=__APP__
-Environment="__YNH_NODE_LOAD_PATH__"
-ExecStart=/bin/sh -c ' npm start'
+ExecStart=__YNH_NODE__ __FINALPATH__/dist/server
 WorkingDirectory=__FINALPATH__/
 StandardOutput=syslog
 StandardError=syslog
diff --git a/manifest.json b/manifest.json
index 8099950..071f03e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Video streaming platform using P2P directly in the web browser, connected to a federated network",
         "fr": "Plateforme de diffusion vidéo par P2P directement dans le navigateur, et connectée à un réseau fédéralisé"
     },
-    "version": "3.1.0~ynh5",
+    "version": "3.1.0~ynh6",
     "url": "https://github.com/Chocobozzz/PeerTube",
     "license": "AGPL-3.0-only",
     "maintainer": [
diff --git a/scripts/install b/scripts/install
index ea739dd..a416115 100644
--- a/scripts/install
+++ b/scripts/install
@@ -187,7 +187,7 @@ chown $app:$app "$final_path/config/local-production.json"
 ynh_script_progression --message="Configuring a systemd service..."
 
 # Create a dedicated systemd config
-ynh_add_systemd_config --others_var="ynh_node_load_PATH"
+ynh_add_systemd_config --others_var="ynh_node ynh_node_load_PATH"
 
 #=================================================
 # START SYSTEMD SERVICE
diff --git a/scripts/upgrade b/scripts/upgrade
index 0db403a..7335c47 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -258,7 +258,7 @@ popd
 ynh_script_progression --message="Upgrading systemd configuration..."
 
 # Create a dedicated systemd config
-ynh_add_systemd_config --others_var="ynh_node_load_PATH"
+ynh_add_systemd_config --others_var="ynh_node ynh_node_load_PATH"
 
 #=================================================
 # GENERIC FINALIZATION