diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index f0a03390..80770f6c 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -173,7 +173,7 @@ function matrix_nginx {
     systemctl restart nginx
 
     # wait for nginx to start otherwise user add fails later
-    sleep 8
+    sleep 5
 }
 
 function matrix_generate_homeserver_file {
@@ -496,8 +496,6 @@ function install_identity_server {
     systemctl daemon-reload
     systemctl start sydent
 
-    sleep 4
-
     if [ ! -f /etc/sydent/sydent.db ]; then
         echo $'No matrix identity server database was created'
         exit 7354383
@@ -568,8 +566,6 @@ function install_home_server {
     systemctl daemon-reload
     systemctl start matrix
 
-    sleep 4
-
     if [ ! -f $MATRIX_DATA_DIR/homeserver.db ]; then
         echo $'No matrix home server database was created'
     fi