diff --git a/ckan.sh b/ckan.sh
index ad27aa2..070e7fd 100755
--- a/ckan.sh
+++ b/ckan.sh
@@ -28,9 +28,9 @@ cp ${SOURCE_DIR}/srv/ckan/update-ip.sh /srv/ckan/update-ip.sh
 /srv/ckan/update-ip.sh
 
 # Populate database
-docker run --rm -h ckan --link=postgres --link=redis --link=solr -v /srv/ckan/conf:/etc/ckan -v /srv/ckan/data:/srv/ckan/storage ckan paster --plugin=ckan db init -c /etc/ckan/ckan.ini
-docker run --rm -h ckan --link=postgres --link=redis --link=solr -v /srv/ckan/conf:/etc/ckan -v /srv/ckan/data:/srv/ckan/storage ckan paster --plugin=ckanext-spatial spatial initdb -c /etc/ckan/ckan.ini
-docker run --rm -h ckan --link=postgres --link=redis --link=solr -v /srv/ckan/conf:/etc/ckan -v /srv/ckan/data:/srv/ckan/storage ckan paster --plugin=ckan datastore set-permissions -c /etc/ckan/ckan.ini | docker exec -i postgres psql
+docker run --rm -h ckan --link postgres --link redis --link solr -v /srv/ckan/conf:/etc/ckan -v /srv/ckan/data:/srv/ckan/storage ckan paster --plugin=ckan db init -c /etc/ckan/ckan.ini
+docker run --rm -h ckan --link postgres --link redis --link solr -v /srv/ckan/conf:/etc/ckan -v /srv/ckan/data:/srv/ckan/storage ckan paster --plugin=ckanext-spatial spatial initdb -c /etc/ckan/ckan.ini
+docker run --rm -h ckan --link postgres --link redis --link solr -v /srv/ckan/conf:/etc/ckan -v /srv/ckan/data:/srv/ckan/storage ckan paster --plugin=ckan datastore set-permissions -c /etc/ckan/ckan.ini | docker exec -i postgres psql
 
 # Create admin account
 export CKAN_ADMIN_USER="admin"
diff --git a/ckan/etc/init.d/ckan b/ckan/etc/init.d/ckan
index 50f8a90..4516a0f 100755
--- a/ckan/etc/init.d/ckan
+++ b/ckan/etc/init.d/ckan
@@ -13,7 +13,7 @@ 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.sh b/crisiscleanup.sh
index efba2f0..656d093 100755
--- a/crisiscleanup.sh
+++ b/crisiscleanup.sh
@@ -26,8 +26,8 @@ cp ${SOURCE_DIR}/srv/crisiscleanup/conf/environments/production.rb /srv/crisiscl
 
 # Populate database
 envsubst <${SOURCE_DIR}/srv/crisiscleanup/db/seeds.rb >/tmp/seeds.rb
-docker run --rm -h crisiscleanup --link=postgres -v /srv/crisiscleanup/conf:/srv/crisiscleanup/config crisiscleanup rake db:schema:load
-docker run --rm -h crisiscleanup --link=postgres -v /srv/crisiscleanup/conf:/srv/crisiscleanup/config -v /tmp/seeds.rb:/srv/crisiscleanup/db/seeds.rb crisiscleanup rake db:seed
+docker run --rm -h crisiscleanup --link postgres -v /srv/crisiscleanup/conf:/srv/crisiscleanup/config crisiscleanup rake db:schema:load
+docker run --rm -h crisiscleanup --link postgres -v /srv/crisiscleanup/conf:/srv/crisiscleanup/config -v /tmp/seeds.rb:/srv/crisiscleanup/db/seeds.rb crisiscleanup rake db:seed
 rm /tmp/seeds.rb
 
 # Create CrisisCleanup service
diff --git a/crisiscleanup/etc/init.d/crisiscleanup b/crisiscleanup/etc/init.d/crisiscleanup
index c2f018f..1aba411 100755
--- a/crisiscleanup/etc/init.d/crisiscleanup
+++ b/crisiscleanup/etc/init.d/crisiscleanup
@@ -9,7 +9,7 @@ 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.sh b/cts.sh
index 9a6c8af..ae23919 100755
--- a/cts.sh
+++ b/cts.sh
@@ -25,7 +25,7 @@ if [ ${DEBUG:-0} -eq 0 ]; then
 fi
 
 # Populate database
-docker run --rm -h cts --link=postgres -v /srv/cts/conf:/srv/cts/cts/settings cts manage.py migrate
+docker run --rm -h cts --link postgres -v /srv/cts/conf:/srv/cts/cts/settings cts manage.py migrate
 
 # Create admin account
 export CTS_ADMIN_EMAIL=admin@example.com
diff --git a/cts/etc/init.d/cts b/cts/etc/init.d/cts
index 969c530..adf0c44 100755
--- a/cts/etc/init.d/cts
+++ b/cts/etc/init.d/cts
@@ -9,7 +9,7 @@ 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.sh b/gnuhealth.sh
index 25967b7..0330369 100755
--- a/gnuhealth.sh
+++ b/gnuhealth.sh
@@ -16,7 +16,7 @@ envsubst <${SOURCE_DIR}/srv/gnuhealth/conf/trytond.conf >/srv/gnuhealth/conf/try
 # Populate database
 export GNUHEALTH_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
 echo ${GNUHEALTH_ADMIN_PWD} >/tmp/.adminpwd
-docker run --rm -h gnuhealth --link=postgres -v /srv/gnuhealth/conf:/srv/gnuhealth/gnuhealth/tryton/server/config -v /tmp/.adminpwd:/tmp/.adminpwd -e TRYTONPASSFILE=/tmp/.adminpwd gnuhealth /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.8/bin/trytond-admin -d gnuhealth --all -v
+docker run --rm -h gnuhealth --link postgres -v /srv/gnuhealth/conf:/srv/gnuhealth/gnuhealth/tryton/server/config -v /tmp/.adminpwd:/tmp/.adminpwd -e TRYTONPASSFILE=/tmp/.adminpwd gnuhealth /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.8/bin/trytond-admin -d gnuhealth --all -v
 rm -f /tmp/.adminpwd
 
 # Populate demo database
diff --git a/gnuhealth/etc/init.d/gnuhealth b/gnuhealth/etc/init.d/gnuhealth
index 45edb9c..e97950b 100755
--- a/gnuhealth/etc/init.d/gnuhealth
+++ b/gnuhealth/etc/init.d/gnuhealth
@@ -9,7 +9,7 @@ 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 d1b8739..c01e2a7 100755
--- a/kanboard/etc/init.d/kanboard
+++ b/kanboard/etc/init.d/kanboard
@@ -9,7 +9,7 @@ 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/app/data -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/app/data -v /srv/kanboard/conf/config.php:/srv/kanboard/config.php kanboard
 }
 
 stop() {
diff --git a/pandora.sh b/pandora.sh
index b5a2794..1b352e3 100755
--- a/pandora.sh
+++ b/pandora.sh
@@ -28,10 +28,10 @@ if [ ${DEBUG:-0} -eq 0 ]; then
 fi
 
 # Populate database
-docker run --rm -h pandora --link=postgres -v /srv/pandora/conf:/srv/pandora/conf pandora /srv/pandora/pandora/manage.py migrate --noinput
-docker run --rm -h pandora --link=postgres -v /srv/pandora/conf:/srv/pandora/conf pandora /srv/pandora/pandora/manage.py sqlfindindex
-docker run --rm -h pandora --link=postgres -v /srv/pandora/conf:/srv/pandora/conf pandora /srv/pandora/pandora/manage.py sync_itemsort
-docker run --rm -h pandora --link=postgres -v /srv/pandora/conf:/srv/pandora/conf pandora /srv/pandora/pandora/manage.py sync_documentsort
+docker run --rm -h pandora --link postgres -v /srv/pandora/conf:/srv/pandora/conf pandora /srv/pandora/pandora/manage.py migrate --noinput
+docker run --rm -h pandora --link postgres -v /srv/pandora/conf:/srv/pandora/conf pandora /srv/pandora/pandora/manage.py sqlfindindex
+docker run --rm -h pandora --link postgres -v /srv/pandora/conf:/srv/pandora/conf pandora /srv/pandora/pandora/manage.py sync_itemsort
+docker run --rm -h pandora --link postgres -v /srv/pandora/conf:/srv/pandora/conf pandora /srv/pandora/pandora/manage.py sync_documentsort
 
 # Create admin account
 export PANDORA_ADMIN_USER=admin
diff --git a/pandora/etc/init.d/pandora b/pandora/etc/init.d/pandora
index 7885f46..b9da292 100755
--- a/pandora/etc/init.d/pandora
+++ b/pandora/etc/init.d/pandora
@@ -9,7 +9,7 @@ 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/seeddms/etc/init.d/seeddms b/seeddms/etc/init.d/seeddms
index ec840d4..96bed2d 100755
--- a/seeddms/etc/init.d/seeddms
+++ b/seeddms/etc/init.d/seeddms
@@ -9,7 +9,7 @@ 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() {