diff --git a/docker/kolab/Dockerfile b/docker/kolab/Dockerfile
index 07ac0e89..7c137ddb 100644
--- a/docker/kolab/Dockerfile
+++ b/docker/kolab/Dockerfile
@@ -1,23 +1,20 @@
 FROM kolab/centos7:latest
 
 RUN yum -y install rsyslog && \
     yum --enablerepo=kolab-16-updates-testing -y update pykolab && \
     yum clean all
 
-RUN systemctl disable \
-        avahi-daemon.service \
-        avahi-daemon.socket \
-        sshd.service && \
-    systemctl enable rsyslog
+COPY kolab-init.service /etc/systemd/system/kolab-init.service
 
-RUN sed -i -r -e 's/^SELINUX=.*$/SELINUX=permissive/g' /etc/selinux/config 2>/dev/null || :
+RUN rm -rf /etc/systemd/system/multi-target.wants/{avahi-daemon,sshd}.* && \
+    ln -s /etc/systemd/system/kolab-init.service \
+        /etc/systemd/system/multi-user.target.wants/kolab-init.service
 
-COPY kolab-init.service /etc/systemd/system/kolab-init.service
-RUN systemctl enable kolab-init.service
+RUN sed -i -r -e 's/^SELINUX=.*$/SELINUX=permissive/g' /etc/selinux/config 2>/dev/null || :
 
 COPY kolab-init.sh /usr/local/sbin/
 RUN chmod 750 /usr/local/sbin/kolab-init.sh
 
 CMD ["/lib/systemd/systemd"]
 
 EXPOSE 21/tcp 22/tcp 25/tcp 53/tcp 53/udp 80/tcp 110/tcp 143/tcp 389/tcp 443/tcp 465/tcp 587/tcp 993/tcp 995/tcp 5353/udp 8880/tcp 8443/tcp 8447/tcp
diff --git a/docker/worker/Dockerfile b/docker/worker/Dockerfile
index 9a9b4486..7e5692a2 100644
--- a/docker/worker/Dockerfile
+++ b/docker/worker/Dockerfile
@@ -1,29 +1,23 @@
 FROM kolab/centos7:latest
 
 RUN yum -y install rsyslog && \
     yum clean all
 
-RUN systemctl disable \
-        avahi-daemon.service \
-        avahi-daemon.socket \
-        sshd.service && \
-    systemctl enable rsyslog
+COPY kolab-worker.service /etc/systemd/system/kolab-worker.service
+RUN rm -rf /etc/systemd/system/multi-target.wants/{avahi-daemon,sshd}.* && \
+    ln -s /etc/systemd/system/kolab-worker.service \
+        /etc/systemd/system/multi-user.target.wants/kolab-worker.service
 
 RUN sed -i -r -e 's/^SELINUX=.*$/SELINUX=permissive/g' /etc/selinux/config 2>/dev/null || :
 
 RUN yum -y install kolab-16-extras-fasttrack && \
     sed -i -r -e '/^ssl/d' /etc/yum.repos.d/*.repo && \
-    yum clean all
-
-RUN yum -y update && \
+    yum -y update php\* && \
     yum clean all
 
 RUN useradd worker
 
-COPY kolab-worker.service /etc/systemd/system/kolab-worker.service
-RUN systemctl enable kolab-worker.service
-
 COPY kolab-worker.sh /usr/local/bin/
 RUN chmod 755 /usr/local/bin/kolab-worker.sh
 
 CMD ["/lib/systemd/systemd"]