diff --git a/scripts/change_url b/scripts/change_url
index c27647c..b30f1e3 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -124,7 +124,7 @@ gitlab-ctl reconfigure
 #=================================================
 ynh_script_progression --message="Waiting for gitlab..." --weight=15
 
-ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=3600
+ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300
 
 #=================================================
 # GENERIC FINALISATION
diff --git a/scripts/install b/scripts/install
index 82a4a2d..29bd8f5 100644
--- a/scripts/install
+++ b/scripts/install
@@ -249,6 +249,13 @@ ynh_script_progression --message="Reloading nginx web server..." --weight=1
 
 ynh_systemd_action --action=reload --service_name=nginx
 
+#=================================================
+# RESTART GITLAB
+#=================================================
+ynh_script_progression --message="Restarting gitlab..." --weight=15
+
+ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300
+
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index f5188bf..882a989 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -156,7 +156,7 @@ yunohost service add "gitlab-runsvdir" --log "/var/log/$app/gitlab-rails/applica
 #=================================================
 ynh_script_progression --message="Waiting for gitlab..." --weight=14
 
-ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=3600
+ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300
 
 #=================================================
 # CHECK THE RESTORED DATA
diff --git a/scripts/upgrade b/scripts/upgrade
index 31cf5e1..58a14d9 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -322,10 +322,9 @@ fi
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-	ynh_script_progression --message="Waiting for gitlab..." --weight=15
+	ynh_script_progression --message="Restarting gitlab..." --weight=15
 
-	# Action status to just wait the service
-	ynh_systemd_action --action=status --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=3600
+	ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300
 fi
 
 #=================================================