diff --git a/misc/lib/systemd/system/celerybeat.service b/misc/lib/systemd/system/celerybeat.service
index 2c7f760..b264628 100644
--- a/misc/lib/systemd/system/celerybeat.service
+++ b/misc/lib/systemd/system/celerybeat.service
@@ -1,12 +1,11 @@
 [Unit]
-Description=Celery workers
+Description=Celery beat
 PartOf=colab.service
 
 [Service]
 User=colab
-ExecStartPre=/usr/bin/mkdir -p /var/run/colab
-ExecStartPre=/usr/bin/chown -R colab:colab /var/lock/colab
-ExecStart=/usr/lib/colab/bin/colab-admin celery beat --pidfile=/var/lock/colab/celerybeat.pid
+ExecStartPre=/usr/bin/install -d -m 0700 -o colab /var/run/colab
+ExecStart=/usr/lib/colab/bin/colab-admin celery beat --pidfile=/var/run/colab/celerybeat.pid --schedule=/var/lib/colab/celery/celereybeat-schedule
 Restart=on-failure
 
 [Install]
diff --git a/misc/lib/systemd/system/celeryd.service b/misc/lib/systemd/system/celeryd.service
index 56e5049..1be535c 100644
--- a/misc/lib/systemd/system/celeryd.service
+++ b/misc/lib/systemd/system/celeryd.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Celery workers
+Description=Celery worker
 PartOf=colab.service
 
 [Service]
diff --git a/misc/lib/systemd/system/colab.service b/misc/lib/systemd/system/colab.service
index c7e1665..cc0fd39 100644
--- a/misc/lib/systemd/system/colab.service
+++ b/misc/lib/systemd/system/colab.service
@@ -1,14 +1,13 @@
 [Unit]
 Description=Colab
-Before=celeryd.service
-Requires=celeryd.service
+Before=celeryd.service celerybeat.service
+Requires=celeryd.service celerybeat.service
 
 [Service]
 User=colab
 EnvironmentFile=-/etc/sysconfig/colab
 PermissionsStartOnly=true
-ExecStartPre=/usr/bin/mkdir -p /var/lock/colab
-ExecStartPre=/usr/bin/chown -R colab:colab /var/lock/colab
+ExecStartPre=/usr/bin/install -d -m 0750 -o colab -g colab /var/lock/colab
 ExecStart=/usr/lib/colab/bin/gunicorn colab.wsgi:application --config=/etc/colab/gunicorn.py
 Restart=on-failure
 
--
libgit2 0.21.2