diff --git a/conf/systemd.service b/conf/systemd.service
index ff11316..0f9ef24 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -11,8 +11,6 @@ Environment=ETHERPAD_PRODUCTION=true
 Environment="__YNH_NODE_LOAD_PATH__"
 Environment="NODE_ENV=production"
 ExecStart=__INSTALL_DIR__/bin/run.sh
-#StandardOutput=append:/var/log/__APP__/etherpad.log
-#StandardError=inherit
 Restart=always
 
 # Sandboxing options to harden security
diff --git a/scripts/change_url b/scripts/change_url
index ccce697..74fc748 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -36,7 +36,7 @@ ynh_change_url_nginx_config
 ynh_script_progression --message="Starting a systemd service..." --weight=10
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log"
+ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="systemd"
 
 #=================================================
 # DEACTIVE MAINTENANCE MODE
diff --git a/scripts/install b/scripts/install
index 10841c2..ec0cac5 100644
--- a/scripts/install
+++ b/scripts/install
@@ -155,7 +155,7 @@ then
 	ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/lang_mypads.sql"
 
 	# Wait for etherpad to be fully started
-	ynh_systemd_action --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log"
+	ynh_systemd_action --action=restart --line_match="Your Etherpad version is" --log_path="systemd"
 fi
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index a698cc2..4c0dbfa 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -65,7 +65,7 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./
 #=================================================
 ynh_script_progression --message="Reloading NGINX web server and $app's service..."
 
-ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log"
+ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="systemd"
 
 ynh_systemd_action --action=reload --service_name=nginx
 
diff --git a/scripts/upgrade b/scripts/upgrade
index aa18c2d..ceed65e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -9,7 +9,7 @@ source /usr/share/yunohost/helpers
 ynh_script_progression --message="Activating maintenance mode..." --weight=2
 
 # Wait for Etherpad to be fully started # (... but why ???)
-ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120"
+ynh_systemd_action --action=restart --line_match="Your Etherpad version is" --log_path="systemd"
 
 ynh_maintenance_mode_ON
 
@@ -175,7 +175,7 @@ ynh_use_logrotate --non-append --specific_user=$app/$app
 #=================================================
 ynh_script_progression --message="Starting systemd service..." --weight=9
 
-ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log"
+ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="systemd"
 
 #=================================================
 # UPGRADE FAIL2BAN