diff --git a/roles/kolibri/templates/kolibri.service.j2 b/roles/kolibri/templates/kolibri.service.j2
index 376319d11..46df59aca 100644
--- a/roles/kolibri/templates/kolibri.service.j2
+++ b/roles/kolibri/templates/kolibri.service.j2
@@ -10,6 +10,8 @@ Environment=KOLIBRI_HTTP_PORT={{ kolibri_http_port }}
 Environment=KOLIBRI_URL_PATH_PREFIX={{ kolibri_url }}
 User={{ kolibri_user }}
 Group={{ apache_user }}
+TimeoutStartSec=infinity
+TimeoutStopSec=10
 ExecStart={{ kolibri_exec_path }} start
 ExecStop={{ kolibri_exec_path }} stop