diff --git a/roles/kolibri/templates/kolibri.service.j2 b/roles/kolibri/templates/kolibri.service.j2
index 84515d3f8..a886aa73e 100644
--- a/roles/kolibri/templates/kolibri.service.j2
+++ b/roles/kolibri/templates/kolibri.service.j2
@@ -10,6 +10,13 @@ Environment=KOLIBRI_HTTP_PORT={{ kolibri_http_port }}
 Environment=KOLIBRI_URL_PATH_PREFIX={{ kolibri_url_without_slash }}
 User={{ kolibri_user }}
 Group={{ apache_user }}
+# 2020-10-03: Kolibri was timing out on RaspiOS & Ubuntu 20 NUC: iiab/iiab#2555
+TimeoutStartSec=1200
+# The following is the systemd default, which is too much for most teachers in
+# low-electricity environments (30-60 sec is about all they can handle before
+# pulling the power cord, typically every hour at the end of class).  But since
+# 90 seconds is the Linux / systemd default, it's prob good enough for now:
+# TimeoutStopSec=90
 # 2020-04-18 @jvonau: comment out both timeouts for now, in favor of 90 seconds
 # or whatever systemd / Kolibri favor? https://github.com/iiab/iiab/issues/2318
 # TimeoutStartSec=infinity