diff --git a/scripts/_common.sh b/scripts/_common.sh
index 9d1fc63..07781a7 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,7 @@
 #=================================================
 
 # dependencies used by the app
-pkg_dependencies="openjdk-11-jdk daemon net-tools"
+pkg_dependencies="openjdk-11-jdk|openjdk-17-jdk daemon net-tools"
 
 PLUGIN_CLI_VERSION=2.9.3
 
diff --git a/scripts/backup b/scripts/backup
index 4806077..b267b1a 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -34,7 +34,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 # STOP SYSTEMD SERVICE
 #=================================================
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped" --log_path="systemd"
 
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
@@ -59,7 +59,7 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 # START SYSTEMD SERVICE
 #=================================================
 
-ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/change_url b/scripts/change_url
index 92feab0..d75f978 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -72,7 +72,7 @@ fi
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped" --log_path="systemd"
 
 #=================================================
 # MODIFY URL IN NGINX CONF
@@ -121,7 +121,7 @@ systemctl daemon-reload --quiet
 ynh_script_progression --message="Starting a systemd service..."
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action="start" --line_match="Started" --log_path="systemd"
 
 #=================================================
 # RELOAD NGINX
diff --git a/scripts/install b/scripts/install
index 751310f..cf95030 100644
--- a/scripts/install
+++ b/scripts/install
@@ -141,7 +141,7 @@ ynh_replace_string --match_string="Environment=\"JENKINS_PORT=8080\"" --replace_
 
 systemctl daemon-reload --quiet
 
-ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
 
 if [[ $dpkg_install_failed -ge 1 ]]; then
   dpkg --configure -a
@@ -208,7 +208,7 @@ yunohost service add $app --description="Jenkins Continuous Integration Server"
 ynh_script_progression --message="Starting a systemd service..."
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
 
 #=================================================
 # SETUP SSOWAT
diff --git a/scripts/remove b/scripts/remove
index 6657b94..78675da 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -37,7 +37,7 @@ fi
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped" --log_path="systemd"
 
 #=================================================
 # REMOVE DEPENDENCIES
diff --git a/scripts/restore b/scripts/restore
index e9cb2f9..8dff3e5 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -89,7 +89,7 @@ ynh_replace_string --match_string="Environment=\"JENKINS_PORT=8080\"" --replace_
 
 systemctl daemon-reload --quiet
 
-ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
 
 #=================================================
 # RESTORE THE APP MAIN DIR
@@ -110,7 +110,7 @@ yunohost service add $app --description="Jenkins Continuous Integration Server"
 #=================================================
 ynh_script_progression --message="Starting a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
 
 #=================================================
 # SEND A README FOR THE ADMIN
diff --git a/scripts/upgrade b/scripts/upgrade
index 73baa5e..4cf4a78 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -52,7 +52,7 @@ ynh_abort_if_errors
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped" --log_path="systemd"
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
@@ -127,7 +127,7 @@ then
 
 	systemctl daemon-reload --quiet
 
-	ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
+	ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
 fi
 
 #=================================================
@@ -186,7 +186,7 @@ yunohost service add $app --description="Jenkins Continuous Integration Server"
 #=================================================
 ynh_script_progression --message="Starting a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
 
 #=================================================
 # SEND A README FOR THE ADMIN