diff --git a/ckan-datapusher/etc/init.d/ckan-datapusher b/ckan-datapusher/etc/init.d/ckan-datapusher
index 694b55e..0b86aa7 100755
--- a/ckan-datapusher/etc/init.d/ckan-datapusher
+++ b/ckan-datapusher/etc/init.d/ckan-datapusher
@@ -17,5 +17,5 @@ start() {
 }
 
 stop() {
-	/usr/bin/docker stop ckan
+	/usr/bin/docker stop ckan-datapusher
 }
diff --git a/ckan/etc/init.d/ckan b/ckan/etc/init.d/ckan
index 7b2cb83..b648f33 100755
--- a/ckan/etc/init.d/ckan
+++ b/ckan/etc/init.d/ckan
@@ -3,9 +3,9 @@
 description="CKAN docker container"
 
 depend() {
-	need docker net
+	need docker net postgres
 	use dns logger netmount postfix
-	after postgres redis solr ckan-datapusher
+	after ckan-datapusher redis solr
 }
 
 start_pre() {
diff --git a/crisiscleanup/etc/init.d/crisiscleanup b/crisiscleanup/etc/init.d/crisiscleanup
index fe20a3e..577fb8c 100755
--- a/crisiscleanup/etc/init.d/crisiscleanup
+++ b/crisiscleanup/etc/init.d/crisiscleanup
@@ -3,9 +3,8 @@
 description="Crisis Cleanup docker container"
 
 depend() {
-	need docker net
+	need docker net postgres
 	use dns logger netmount postfix
-	after postgres
 }
 
 start() {
diff --git a/cts/etc/init.d/cts b/cts/etc/init.d/cts
index 7907b97..78895a4 100755
--- a/cts/etc/init.d/cts
+++ b/cts/etc/init.d/cts
@@ -3,9 +3,8 @@
 description="CTS docker container"
 
 depend() {
-	need docker net
+	need docker net postgres
 	use dns logger netmount
-	after postgres
 }
 
 start() {
diff --git a/gnuhealth/etc/init.d/gnuhealth b/gnuhealth/etc/init.d/gnuhealth
index 16e1723..a8c37d2 100755
--- a/gnuhealth/etc/init.d/gnuhealth
+++ b/gnuhealth/etc/init.d/gnuhealth
@@ -3,9 +3,8 @@
 description="GNU Health docker container"
 
 depend() {
-	need docker net
+	need docker net postgres
 	use dns logger netmount postfix
-	after postgres
 }
 
 start() {
diff --git a/kanboard/etc/init.d/kanboard b/kanboard/etc/init.d/kanboard
index 6ca0c2c..b8565aa 100755
--- a/kanboard/etc/init.d/kanboard
+++ b/kanboard/etc/init.d/kanboard
@@ -3,9 +3,8 @@
 description="KanBoard docker container"
 
 depend() {
-	need docker net
+	need docker net postgres
 	use dns logger netmount postfix
-	after postgres
 }
 
 start() {
diff --git a/mifosx/etc/init.d/mifosx b/mifosx/etc/init.d/mifosx
index 7ab17ad..dd1c1e2 100755
--- a/mifosx/etc/init.d/mifosx
+++ b/mifosx/etc/init.d/mifosx
@@ -3,9 +3,8 @@
 description="Mifos X docker container"
 
 depend() {
-	need docker net
+	need docker net mariadb
 	use dns logger netmount postfix
-	after mariadb
 }
 
 start() {
diff --git a/motech/etc/init.d/motech b/motech/etc/init.d/motech
index 3dfe959..df4f4be 100755
--- a/motech/etc/init.d/motech
+++ b/motech/etc/init.d/motech
@@ -3,9 +3,8 @@
 description="Motech docker container"
 
 depend() {
-	need docker net
+	need docker net postgres activemq
 	use dns logger netmount postfix
-	after activemq postgres
 }
 
 start() {
diff --git a/openmapkit/etc/init.d/openmapkit b/openmapkit/etc/init.d/openmapkit
index e407413..6ad6102 100755
--- a/openmapkit/etc/init.d/openmapkit
+++ b/openmapkit/etc/init.d/openmapkit
@@ -18,5 +18,5 @@ start() {
 }
 
 stop() {
-	/usr/bin/docker kill openmapkit
+	/usr/bin/docker stop openmapkit
 }
diff --git a/pandora/etc/init.d/pandora b/pandora/etc/init.d/pandora
index ae6337f..25bf1e9 100755
--- a/pandora/etc/init.d/pandora
+++ b/pandora/etc/init.d/pandora
@@ -3,9 +3,8 @@
 description="Pan.do/ra docker container"
 
 depend() {
-	need docker net
+	need docker net postgres rabbitmq
 	use dns logger netmount postfix
-	after postgres rabbitmq
 }
 
 start() {
diff --git a/sahana/etc/init.d/sahana b/sahana/etc/init.d/sahana
index 64bdc87..166307b 100755
--- a/sahana/etc/init.d/sahana
+++ b/sahana/etc/init.d/sahana
@@ -3,9 +3,8 @@
 description="Sahana Eden docker container"
 
 depend() {
-	need docker net
+	need docker net postgres
 	use dns logger netmount postfix
-	after postgres
 }
 
 start() {
diff --git a/sambro/etc/init.d/sambro b/sambro/etc/init.d/sambro
index 7f4c7fc..56dc9bb 100755
--- a/sambro/etc/init.d/sambro
+++ b/sambro/etc/init.d/sambro
@@ -3,9 +3,8 @@
 description="SAMBRO docker container"
 
 depend() {
-	need docker net
+	need docker net postgres
 	use dns logger netmount postfix
-	after postgres
 }
 
 start() {
diff --git a/seeddms/etc/init.d/seeddms b/seeddms/etc/init.d/seeddms
index d8f4d0d..a060acf 100755
--- a/seeddms/etc/init.d/seeddms
+++ b/seeddms/etc/init.d/seeddms
@@ -3,9 +3,8 @@
 description="SeedDMS docker container"
 
 depend() {
-	need docker net
+	need docker net postgres
 	use dns logger netmount postfix
-	after postgres
 }
 
 start() {
diff --git a/sigmah/etc/init.d/sigmah b/sigmah/etc/init.d/sigmah
index 0a91e64..1bf040b 100755
--- a/sigmah/etc/init.d/sigmah
+++ b/sigmah/etc/init.d/sigmah
@@ -3,9 +3,8 @@
 description="Sigmah docker container"
 
 depend() {
-	need docker net
+	need docker net postgres activemq
 	use dns logger netmount postfix
-	after activemq postgres
 }
 
 start() {
diff --git a/ushahidi/etc/init.d/ushahidi b/ushahidi/etc/init.d/ushahidi
index 40180a0..cf31c08 100755
--- a/ushahidi/etc/init.d/ushahidi
+++ b/ushahidi/etc/init.d/ushahidi
@@ -3,9 +3,8 @@
 description="Ushahidi docker container"
 
 depend() {
-	need docker net
+	need docker net mariadb
 	use dns logger netmount postfix
-	after mariadb
 }
 
 start() {