diff --git a/conf/systemd.service b/conf/systemd.service
index 47d6b59..0ceab39 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -9,7 +9,7 @@ Group=__APP__
 WorkingDirectory=__FINALPATH__
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
-ExecStart=__FINALPATH__/node_modules/ep_etherpad-lite/node/server.js
+ExecStart=--experimental-worker __FINALPATH__/node_modules/ep_etherpad-lite/node/server.js
 Restart=always
 
 [Install]
diff --git a/scripts/install b/scripts/install
index 5795428..390b6c4 100644
--- a/scripts/install
+++ b/scripts/install
@@ -183,7 +183,7 @@ yunohost service add $app --description "Etherpad-lite, the collaborative editor
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Your Etherpad version is" 
+ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Your Etherpad version is" --timeout="120"
 
 #=================================================
 # SETUP SSOWAT
diff --git a/scripts/upgrade b/scripts/upgrade
index 12deddd..29b7724 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -166,7 +166,7 @@ yunohost service add $app --description "Etherpad-lite, the collaborative editor
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --time --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Your Etherpad version is" 
+ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Your Etherpad version is" --timeout="120" 
 
 #=================================================
 # RELOAD NGINX