diff --git a/unit-files/haproxy-confd.service b/unit-files/haproxy-confd.service
index 99ff82e2cce8b8f0a3e30ce8e04c728a7745510d..cc746028768453d609a5259630b0f824060294ef 100644
--- a/unit-files/haproxy-confd.service
+++ b/unit-files/haproxy-confd.service
@@ -1,19 +1,23 @@
 [Unit]
 Description=%p
-After=docker.service
+
+# Requirements
 Requires=docker.service
 
+# Dependency ordering
+After=docker.service
+
 [Service]
 Restart=always
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
-ExecStart=/usr/bin/docker run\
---name %p\
--v /data/server-wide/haproxy/:/etc/haproxy/\
--v /data/indiehosters/confd/:/etc/confd/\
--v /var/run/docker.sock:/var/run/docker.sock\
-indiehosters/confd
+ExecStart=/usr/bin/docker run \
+  --name %p \
+  -v /data/server-wide/haproxy/:/etc/haproxy/ \
+  -v /data/indiehosters/confd/:/etc/confd/ \
+  -v /var/run/docker.sock:/var/run/docker.sock \
+  indiehosters/confd
 ExecReload=/usr/bin/docker restart %p
 ExecStop=/usr/bin/docker stop %p
 
diff --git a/unit-files/haproxy.service b/unit-files/haproxy.service
index 93b98305d978cfa8003e51eb4f2f03449b4b3ba6..5a9b6bfa0deda1793e27b55a06e50e579f6ecc0c 100644
--- a/unit-files/haproxy.service
+++ b/unit-files/haproxy.service
@@ -1,19 +1,23 @@
 [Unit]
 Description=%p
-After=docker.service
+
+# Requirements
 Requires=docker.service
 
+# Dependency ordering
+After=docker.service
+
 [Service]
 Restart=always
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
-ExecStart=/usr/bin/docker run\
---name %p\
--v /data/server-wide/haproxy:/etc/haproxy\
--p 80:80\
--p 443:443\
-indiehosters/haproxy
+ExecStart=/usr/bin/docker run \
+  --name %p \
+  -v /data/server-wide/haproxy:/etc/haproxy \
+  -p 80:80 \
+  -p 443:443 \
+  indiehosters/haproxy
 ExecReload=/usr/bin/docker restart %p
 ExecStop=/usr/bin/docker stop %p
 
diff --git a/unit-files/nginx-discovery@.service b/unit-files/nginx-discovery@.service
index 25c620c75139ccfe1b8e7d010cf5e036f2da2edc..8b7a16b14039f866ea1c1b82bf936d60fd782878 100644
--- a/unit-files/nginx-discovery@.service
+++ b/unit-files/nginx-discovery@.service
@@ -5,17 +5,18 @@ Description=%p for %i etcd registration
 Requires=etcd.service
 Requires=nginx@%i.service
 
-# Dependency ordering and binding
+# Dependency ordering
 After=etcd.service
 After=nginx@%i.service
+
+# Dependency binding
 BindsTo=nginx@%i.service
 
 [Service]
-
 TimeoutStartSec=0
 # Start
 ## Test whether service is accessible and then register useful information
-ExecStart=/bin/bash -c '\
+ExecStart=/bin/bash -c ' \
   sleep 3; \
   while true; do \
     app=`echo %p | cut -d"-" -f1`; \
@@ -30,6 +31,6 @@ ExecStart=/bin/bash -c '\
   done'
 
 # Stop
-ExecStop=/bin/bash -ceux '\
-  app=`echo %p | cut -d"-" -f1`;\
+ExecStop=/bin/bash -ceux ' \
+  app=`echo %p | cut -d"-" -f1`; \
   /usr/bin/etcdctl rm /services/$app/%i
diff --git a/unit-files/nginx-importer@.service b/unit-files/nginx-importer@.service
index 3a0e4390ef74683319b945698b096bb697050800..9907c6e80900892c5fd493e76d576137e11286c7 100644
--- a/unit-files/nginx-importer@.service
+++ b/unit-files/nginx-importer@.service
@@ -1,5 +1,7 @@
-[Unit]  
+[Unit]
 Description=nginx importer
+
+# Dependency ordering
 Before=nginx@%i.service
 
 [Service]
diff --git a/unit-files/nginx@.service b/unit-files/nginx@.service
index 7040eb381ae420ee2e361a695bd388feb676ddd3..438abc19d44266b66ddc38d99043d419b9cd1899 100644
--- a/unit-files/nginx@.service
+++ b/unit-files/nginx@.service
@@ -1,22 +1,26 @@
 [Unit]
 Description=%p-%i
-After=docker.service
+
+# Requirements
 Requires=docker.service
 Requires=etcd.service
 Requires=%p-importer@%i.service
-After=%p-importer@%i.service
 Requires=%p-discovery@%i.service
+
+# Dependency ordering
 Before=%p-discovery@%i.service
+After=docker.service
+After=%p-importer@%i.service
 
 [Service]
 Restart=always
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p-%i
 ExecStartPre=-/usr/bin/docker rm %p-%i
-ExecStart=/usr/bin/docker run\
---name %p-%i\
--v /data/per-user/%i/%p/data/www-content:/app\
-indiehosters/nginx
+ExecStart=/usr/bin/docker run \
+  --name %p-%i \
+  -v /data/per-user/%i/%p/data/www-content:/app \
+  indiehosters/nginx
 ExecReload=/usr/bin/docker restart %p-%i
 ExecStop=/usr/bin/docker stop %p-%i
 
diff --git a/unit-files/postfix.service b/unit-files/postfix.service
index bcb06a6c27c2b2d5a42a1401e2c333135fe249e4..0188ff274dc25d1f69b6863b07c8afe66f9eb642 100644
--- a/unit-files/postfix.service
+++ b/unit-files/postfix.service
@@ -1,18 +1,22 @@
 [Unit]
 Description=%p
-After=docker.service
+
+# Requirements
 Requires=docker.service
 
+# Dependency ordering
+After=docker.service
+
 [Service]
 Restart=always
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
-ExecStart=/usr/bin/docker run\
---name %p\
--p 25:25\
--v /data/server-wide/postfix/:/data\
-indiehosters/postfix-forwarder
+ExecStart=/usr/bin/docker run \
+  --name %p \
+  -v /data/server-wide/postfix/:/data \
+  -p 25:25 \
+  indiehosters/postfix-forwarder
 ExecReload=/usr/bin/docker restart %p
 ExecStop=/usr/bin/docker stop %p