diff --git a/data/Dockerfiles/sogo/Dockerfile b/data/Dockerfiles/sogo/Dockerfile
index f1e820d79..adc0f66d8 100644
--- a/data/Dockerfiles/sogo/Dockerfile
+++ b/data/Dockerfiles/sogo/Dockerfile
@@ -5,6 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ENV LC_ALL C
 ENV GOSU_VERSION 1.9
 
+# Prerequisites
 RUN apt-get update && apt-get install -y --no-install-recommends \
 		apt-transport-https \
 		ca-certificates \
@@ -27,21 +28,18 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	&& chmod +x /usr/local/bin/gosu \
 	&& gosu nobody true
 
-RUN mkdir /usr/share/doc/sogo
-RUN touch /usr/share/doc/sogo/empty.sh
-
-RUN apt-key adv --keyserver keys.gnupg.net --recv-key 0x810273C4 \
+RUN mkdir /usr/share/doc/sogo \
+	&& touch /usr/share/doc/sogo/empty.sh \
+	&& apt-key adv --keyserver keys.gnupg.net --recv-key 0x810273C4 \
 	&& echo "deb http://packages.inverse.ca/SOGo/nightly/3/debian/ jessie jessie" > /etc/apt/sources.list.d/sogo.list \
 	&& apt-get update && apt-get install -y --force-yes \
 		sogo \
 		sogo-activesync \
-	&& rm -rf /var/lib/apt/lists/*
-
-RUN echo '* * * * *   sogo   /usr/sbin/sogo-ealarms-notify 2>/dev/null' > /etc/cron.d/sogo
-RUN echo '* * * * *   sogo   /usr/sbin/sogo-tool expire-sessions 60' >> /etc/cron.d/sogo
-RUN echo '0 0 * * *   sogo   /usr/sbin/sogo-tool update-autoreply -p /etc/sogo/sieve.creds' >> /etc/cron.d/sogo
-
-RUN touch /etc/default/locale
+	&& rm -rf /var/lib/apt/lists/* \
+	&& echo '* * * * *   sogo   /usr/sbin/sogo-ealarms-notify 2>/dev/null' > /etc/cron.d/sogo \
+	&& echo '* * * * *   sogo   /usr/sbin/sogo-tool expire-sessions 60' >> /etc/cron.d/sogo \
+	&& echo '0 0 * * *   sogo   /usr/sbin/sogo-tool update-autoreply -p /etc/sogo/sieve.creds' >> /etc/cron.d/sogo \
+	&& touch /etc/default/locale
 
 COPY ./reconf-domains.sh /
 COPY syslog-ng.conf /etc/syslog-ng/syslog-ng.conf