diff --git a/activemq/etc/init.d/activemq b/activemq/etc/init.d/activemq
index ed6983d..2638975 100755
--- a/activemq/etc/init.d/activemq
+++ b/activemq/etc/init.d/activemq
@@ -8,7 +8,11 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name activemq -h activemq -v /srv/activemq/data:/srv/activemq/data activemq
+	/usr/bin/docker run -d --rm \
+	--name activemq \
+	-h activemq \
+	-v /srv/activemq/data:/srv/activemq/data \
+	activemq
 }
 
 stop() {
diff --git a/ckan-datapusher/etc/init.d/ckan-datapusher b/ckan-datapusher/etc/init.d/ckan-datapusher
index 784f1a8..81cd9d9 100755
--- a/ckan-datapusher/etc/init.d/ckan-datapusher
+++ b/ckan-datapusher/etc/init.d/ckan-datapusher
@@ -8,7 +8,13 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name ckan-datapusher -h ckan-datapusher -p 127.0.0.1:9004:8004 -v /srv/ckan-datapusher/conf:/etc/ckan-datapusher -v /srv/ckan-datapusher/data:/srv/ckan-datapusher/data ckan-datapusher
+	/usr/bin/docker run -d --rm \
+	--name ckan-datapusher \
+	-h ckan-datapusher \
+	-p 127.0.0.1:9004:8004 \
+	-v /srv/ckan-datapusher/conf:/etc/ckan-datapusher \
+	-v /srv/ckan-datapusher/data:/srv/ckan-datapusher/data \
+	ckan-datapusher
 }
 
 stop() {
diff --git a/ckan/etc/init.d/ckan b/ckan/etc/init.d/ckan
index 4516a0f..3a71632 100755
--- a/ckan/etc/init.d/ckan
+++ b/ckan/etc/init.d/ckan
@@ -13,7 +13,17 @@ start_pre() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name ckan -h ckan --link postgres --link redis --link solr --link ckan-datapusher -p 127.0.0.1:9003:8003 -v /srv/ckan/conf:/etc/ckan -v /srv/ckan/data:/srv/ckan/storage ckan
+	/usr/bin/docker run -d --rm \
+	--name ckan \
+	-h ckan \
+	--link postgres \
+	--link redis \
+	--link solr \
+	--link ckan-datapusher \
+	-p 127.0.0.1:9003:8003 \
+	-v /srv/ckan/conf:/etc/ckan \
+	-v /srv/ckan/data:/srv/ckan/storage \
+	ckan
 }
 
 stop() {
diff --git a/crisiscleanup/etc/init.d/crisiscleanup b/crisiscleanup/etc/init.d/crisiscleanup
index 1aba411..54f06c6 100755
--- a/crisiscleanup/etc/init.d/crisiscleanup
+++ b/crisiscleanup/etc/init.d/crisiscleanup
@@ -9,7 +9,13 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name crisiscleanup -h crisiscleanup --link postgres -p 127.0.0.1:9005:8005 -v /srv/crisiscleanup/conf:/srv/crisiscleanup/config crisiscleanup
+	/usr/bin/docker run -d --rm \
+	--name crisiscleanup \
+	-h crisiscleanup \
+	--link postgres \
+	-p 127.0.0.1:9005:8005 \
+	-v /srv/crisiscleanup/conf:/srv/crisiscleanup/config \
+	crisiscleanup
 }
 
 stop() {
diff --git a/cts/etc/init.d/cts b/cts/etc/init.d/cts
index adf0c44..d68fe30 100755
--- a/cts/etc/init.d/cts
+++ b/cts/etc/init.d/cts
@@ -9,7 +9,13 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name cts -h cts --link postgres -p 127.0.0.1:9006:8006 -v /srv/cts/conf:/srv/cts/cts/settings cts
+	/usr/bin/docker run -d --rm \
+	--name cts \
+	-h cts \
+	--link postgres \
+	-p 127.0.0.1:9006:8006 \
+	-v /srv/cts/conf:/srv/cts/cts/settings \
+	cts
 }
 
 stop() {
diff --git a/gnuhealth/etc/init.d/gnuhealth b/gnuhealth/etc/init.d/gnuhealth
index e97950b..06eb7c1 100755
--- a/gnuhealth/etc/init.d/gnuhealth
+++ b/gnuhealth/etc/init.d/gnuhealth
@@ -9,7 +9,13 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name gnuhealth -h gnuhealth --link postgres -p 127.0.0.1:9008:8008 -v /srv/gnuhealth/conf:/srv/gnuhealth/gnuhealth/tryton/server/config gnuhealth
+	/usr/bin/docker run -d --rm \
+	--name gnuhealth \
+	-h gnuhealth \
+	--link postgres \
+	-p 127.0.0.1:9008:8008 \
+	-v /srv/gnuhealth/conf:/srv/gnuhealth/gnuhealth/tryton/server/config \
+	gnuhealth
 }
 
 stop() {
diff --git a/kanboard/etc/init.d/kanboard b/kanboard/etc/init.d/kanboard
index d132528..06477cd 100755
--- a/kanboard/etc/init.d/kanboard
+++ b/kanboard/etc/init.d/kanboard
@@ -9,7 +9,14 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name kanboard -h kanboard --link postgres -p 127.0.0.1:9009:8009 -v /srv/kanboard/data:/srv/kanboard/data/files -v /srv/kanboard/conf/config.php:/srv/kanboard/config.php kanboard
+	/usr/bin/docker run -d --rm \
+	--name kanboard \
+	-h kanboard \
+	--link postgres \
+	-p 127.0.0.1:9009:8009 \
+	-v /srv/kanboard/data:/srv/kanboard/data/files \
+	-v /srv/kanboard/conf/config.php:/srv/kanboard/config.php \
+	kanboard
 }
 
 stop() {
diff --git a/mariadb/etc/init.d/mariadb b/mariadb/etc/init.d/mariadb
index 1d4c909..55fc7c8 100755
--- a/mariadb/etc/init.d/mariadb
+++ b/mariadb/etc/init.d/mariadb
@@ -8,7 +8,12 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name mariadb -h mariadb -v /srv/mariadb/my.cnf:/etc/mysql/my.cnf -v /srv/mariadb/data:/var/lib/mysql mariadb
+	/usr/bin/docker run -d --rm \
+	--name mariadb \
+	-h mariadb \
+	-v /srv/mariadb/my.cnf:/etc/mysql/my.cnf \
+	-v /srv/mariadb/data:/var/lib/mysql \
+	mariadb
 }
 
 stop() {
diff --git a/mifosx/etc/init.d/mifosx b/mifosx/etc/init.d/mifosx
index 3171b3e..54b52dc 100755
--- a/mifosx/etc/init.d/mifosx
+++ b/mifosx/etc/init.d/mifosx
@@ -9,7 +9,13 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name mifosx -h mifosx --link mariadb -p 127.0.0.1:9012:8012 -v /srv/mifosx/context.xml:/srv/tomcat/webapps/fineract-provider/META-INF/context.xml mifosx
+	/usr/bin/docker run -d --rm \
+	--name mifosx \
+	-h mifosx \
+	--link mariadb \
+	-p 127.0.0.1:9012:8012 \
+	-v /srv/mifosx/context.xml:/srv/tomcat/webapps/fineract-provider/META-INF/context.xml \
+	mifosx
 }
 
 stop() {
diff --git a/motech/etc/init.d/motech b/motech/etc/init.d/motech
index cdd9023..6f6f9a4 100755
--- a/motech/etc/init.d/motech
+++ b/motech/etc/init.d/motech
@@ -9,7 +9,14 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name motech -h motech --link activemq --link postgres -p 127.0.0.1:9013:8013 -v /srv/motech/conf:/srv/tomcat/.motech motech
+	/usr/bin/docker run -d --rm \
+	--name motech \
+	-h motech \
+	--link activemq \
+	--link postgres \
+	-p 127.0.0.1:9013:8013 \
+	-v /srv/motech/conf:/srv/tomcat/.motech \
+	motech
 }
 
 stop() {
diff --git a/openmapkit/etc/init.d/openmapkit b/openmapkit/etc/init.d/openmapkit
index eae1932..1e2b662 100755
--- a/openmapkit/etc/init.d/openmapkit
+++ b/openmapkit/etc/init.d/openmapkit
@@ -8,7 +8,13 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name openmapkit -h openmapkit -p 127.0.0.1:9007:8007 -v /srv/openmapkit/settings.js:/srv/openmapkit/settings.js -v /srv/openmapkit/data:/srv/openmapkit/data openmapkit
+	/usr/bin/docker run -d --rm \
+	--name openmapkit \
+	-h openmapkit \
+	-p 127.0.0.1:9007:8007 \
+	-v /srv/openmapkit/settings.js:/srv/openmapkit/settings.js \
+	-v /srv/openmapkit/data:/srv/openmapkit/data \
+	openmapkit
 }
 
 stop() {
diff --git a/pandora/etc/init.d/pandora b/pandora/etc/init.d/pandora
index b9da292..d089ed4 100755
--- a/pandora/etc/init.d/pandora
+++ b/pandora/etc/init.d/pandora
@@ -9,7 +9,15 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name pandora -h pandora --link postgres --link rabbitmq -p 127.0.0.1:9011:8011 -v /srv/pandora/conf:/srv/pandora/conf -v /srv/pandora/data:/srv/pandora/data pandora
+	/usr/bin/docker run -d --rm \
+	--name pandora \
+	-h pandora \
+	--link postgres \
+	--link rabbitmq \
+	-p 127.0.0.1:9011:8011 \
+	-v /srv/pandora/conf:/srv/pandora/conf \
+	-v /srv/pandora/data:/srv/pandora/data \
+	pandora
 }
 
 stop() {
diff --git a/postfix/etc/init.d/postfix b/postfix/etc/init.d/postfix
index ab7f800..b5fa26b 100755
--- a/postfix/etc/init.d/postfix
+++ b/postfix/etc/init.d/postfix
@@ -8,7 +8,12 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name postfix -h postfix -v /srv/postfix/conf:/etc/postfix -v /srv/postfix/data:/var/spool/postfix postfix
+	/usr/bin/docker run -d --rm \
+	--name postfix \
+	-h postfix \
+	-v /srv/postfix/conf:/etc/postfix \
+	-v /srv/postfix/data:/var/spool/postfix \
+	postfix
 }
 
 stop() {
diff --git a/postgres/etc/init.d/postgres b/postgres/etc/init.d/postgres
index a19a497..4d87135 100755
--- a/postgres/etc/init.d/postgres
+++ b/postgres/etc/init.d/postgres
@@ -8,7 +8,11 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name postgres -h postgres -v /srv/postgres:/var/lib/postgresql postgres
+	/usr/bin/docker run -d --rm \
+	--name postgres \
+	-h postgres \
+	-v /srv/postgres:/var/lib/postgresql \
+	postgres
 }
 
 stop() {
diff --git a/rabbitmq/etc/init.d/rabbitmq b/rabbitmq/etc/init.d/rabbitmq
index 16a13e2..63f20fe 100755
--- a/rabbitmq/etc/init.d/rabbitmq
+++ b/rabbitmq/etc/init.d/rabbitmq
@@ -8,7 +8,11 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name rabbitmq -h rabbitmq -v /srv/rabbitmq/data:/var/lib/rabbitmq/mnesia rabbitmq
+	/usr/bin/docker run -d --rm \
+	--name rabbitmq \
+	-h rabbitmq \
+	-v /srv/rabbitmq/data:/var/lib/rabbitmq/mnesia \
+	rabbitmq
 }
 
 stop() {
diff --git a/redis/etc/init.d/redis b/redis/etc/init.d/redis
index 0e83179..3086eac 100755
--- a/redis/etc/init.d/redis
+++ b/redis/etc/init.d/redis
@@ -8,7 +8,12 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name redis -h redis -v /srv/redis/redis.conf:/etc/redis.conf -v /srv/redis/data:/var/lib/redis redis
+	/usr/bin/docker run -d --rm \
+	--name redis \
+	-h redis \
+	-v /srv/redis/redis.conf:/etc/redis.conf \
+	-v /srv/redis/data:/var/lib/redis \
+	redis
 }
 
 stop() {
diff --git a/seeddms/etc/init.d/seeddms b/seeddms/etc/init.d/seeddms
index 96bed2d..354ce3c 100755
--- a/seeddms/etc/init.d/seeddms
+++ b/seeddms/etc/init.d/seeddms
@@ -9,7 +9,14 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name seeddms -h seeddms --link postgres -p 127.0.0.1:9010:8010 -v /srv/seeddms/data:/srv/seeddms/data -v /srv/seeddms/conf:/srv/seeddms/www/conf seeddms
+	/usr/bin/docker run -d --rm \
+	--name seeddms \
+	-h seeddms \
+	--link postgres \
+	-p 127.0.0.1:9010:8010 \
+	-v /srv/seeddms/data:/srv/seeddms/data \
+	-v /srv/seeddms/conf:/srv/seeddms/www/conf \
+	seeddms
 }
 
 stop() {
diff --git a/solr/etc/init.d/solr b/solr/etc/init.d/solr
index ed732a7..4d5cfb8 100755
--- a/solr/etc/init.d/solr
+++ b/solr/etc/init.d/solr
@@ -8,7 +8,11 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name solr -h solr -v /srv/solr/data:/var/lib/solr solr
+	/usr/bin/docker run -d --rm \
+	--name solr \
+	-h solr \
+	-v /srv/solr/data:/var/lib/solr \
+	solr
 }
 
 stop() {
diff --git a/ushahidi/etc/init.d/ushahidi b/ushahidi/etc/init.d/ushahidi
index cb91566..efe76f7 100755
--- a/ushahidi/etc/init.d/ushahidi
+++ b/ushahidi/etc/init.d/ushahidi
@@ -9,7 +9,13 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name ushahidi -h ushahidi --link mariadb -p 127.0.0.1:9014:8014 -v /srv/ushahidi/.env:/srv/ushahidi/platform/.env ushahidi
+	/usr/bin/docker run -d --rm \
+	--name ushahidi \
+	-h ushahidi \
+	--link mariadb \
+	-p 127.0.0.1:9014:8014 \
+	-v /srv/ushahidi/.env:/srv/ushahidi/platform/.env \
+	ushahidi
 }
 
 stop() {