diff --git a/scripts/_common.sh b/scripts/_common.sh
index 0239616..ac55011 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -22,6 +22,19 @@ COMMIT="bc855b0a1722d2f4ac534ea4d4035299acb7a40a"
 # PERSONAL HELPERS
 #=================================================
 
+# Check if service is ready
+is_service_ready() {
+    for ((i = 0 ; i < 15 ; i++))
+    do
+        if [ "200" -eq $(curl --silent --insecure --resolve $domain:443:127.0.0.1 https://$domain$path_url/ -o /dev/null --write-out "%{http_code}") ]
+        then
+            break
+        else
+            sleep 2
+        fi
+    done
+}
+
 #================================================
 # EXPERIMENTAL HELPERS
 #=================================================
diff --git a/scripts/change_url b/scripts/change_url
index f2cf38e..b69f6f3 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -119,7 +119,6 @@ ynh_replace_string --match_string="APP_HOST=http://localhost:3001" --replace_str
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
-sleep 10
 
 #=================================================
 # RELOAD NGINX
@@ -128,6 +127,13 @@ ynh_script_progression --message="Reloading nginx web server..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
+#=================================================
+# WAITING FOR SERVICE
+#=================================================
+ynh_script_progression --message="Waiting for service..."  --weight=1
+
+is_service_ready
+
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/install b/scripts/install
index c139385..45e42c6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -218,7 +218,6 @@ 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"
-sleep 10
 
 #=================================================
 # SETUP SSOWAT
@@ -240,6 +239,13 @@ ynh_script_progression --message="Reloading nginx web server..." --weight=2
 
 ynh_systemd_action --service_name=nginx --action=reload
 
+#=================================================
+# WAITING FOR SERVICE
+#=================================================
+ynh_script_progression --message="Waiting for service..."  --weight=1
+
+is_service_ready
+
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 769305a..a967dc9 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -133,7 +133,6 @@ yunohost service add $app --description "Standard Notes" --log "/var/log/$app/$a
 ynh_script_progression --message="Starting a systemd service..." --weight=2
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
-sleep 10
 
 #=================================================
 # RESTORE THE LOGROTATE CONFIGURATION
@@ -150,6 +149,13 @@ ynh_script_progression --message="Reloading nginx web server..." --weight=2
 
 ynh_systemd_action --service_name=nginx --action=reload
 
+#=================================================
+# WAITING FOR SERVICE
+#=================================================
+ynh_script_progression --message="Waiting for service..."  --weight=1
+
+is_service_ready
+
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 41e3409..f810e36 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -245,7 +245,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=2
 
 # Start a systemd service
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
-sleep 10
 
 #=================================================
 # UPGRADE FAIL2BAN
@@ -262,6 +261,13 @@ ynh_script_progression --message="Reloading nginx web server..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
+#=================================================
+# WAITING FOR SERVICE
+#=================================================
+ynh_script_progression --message="Waiting for service..."  --weight=1
+
+is_service_ready
+
 #=================================================
 # END OF SCRIPT
 #=================================================