diff --git a/APKBUILD b/APKBUILD
index 943dda7..4339e2b 100644
--- a/APKBUILD
+++ b/APKBUILD
@@ -89,7 +89,7 @@ prepare() {
 	NPM_PACKAGES="${HOME}/.npm-packages"
 	export PATH="$PATH:$NPM_PACKAGES/bin"
 
-#	npm install bower grunt -g
+	npm install bower grunt -g
 }
 
 build() {
@@ -115,17 +115,3 @@ package() {
 
 	DESTDIR="${pkgdir}" ./install.sh -u oneadmin -g cloud
 }
-
-sha512sums="
-292a1a3a823d4ec3e6cdec59b0f9fbf81125d0541bc8a2e234343f59fc9c4e7f2f2f1cd14463211a8c750bb902021dc1389a47927ad491a1cee2fa064307e813  release-6.2.2.tar.gz
-1e2c5da5c2ab49ab355550568985cc538d591198343ec468277d0bb5106275fb4cf7e2acdc26868c79803313a4aec935568370b723bce3384c7e056f26fa9066  svn.patch
-121d43da2299a8f347dfff2124253617d2d4f175bafe5f14687a58e72ada60f08fbdcba1b5dbdc48434c226a6f75b46eb2e9203f8549733d1393ca348f5a00ff  opennebula
-c3d85c11a1e6f9ae05a45378ba398ac68ee2a8b961f0f24e394bbdf92c83c8fcc64c5619819afc1b2e563607e99bd6402744fba396bd3c6c4f48c0a8b09f897e  opennebula-scheduler
-6c5127d4b515777bba83236623066f300f0f8a6086a19848b72edb9cdb74fd906595d02b971de91d67585e79d8d419e5a66d3cc69c55d898561c4a5f74a303d3  opennebula-novnc
-99510f519200d16b65c6fef50cfbc6f88950453759b8e2eab3e729bc8329fbb605dbe7fa6c11febccac6ded0cd1328aef9d1137028a0083e0a9de0a51d357dfc  opennebula-sunstone
-17a0d28b60301c59fc4a6fbeaf759c5d075981b000ef93f67e151f16c0ec339de3e0b4b6ead1ca33903428394abdea40eac907a419f136ba7a1b6fa8965e1422  opennebula-hem
-1ac94e85f3ebe43e51d87a75560d7d7aa48f291326d7b049381329435a7ed575fbfd1dbf23ff9c055bbb900994aa61885a2b7efb7c3e92c21d1d203b8d047231  opennebula-flow
-fdb1eeacb5767cae78829295551a0e924e31d6b47f899fb341652607b8efe5b630c0233835e940f5d8577632d223ab46a87eee2ebce36a1b43077aa561ac47e3  opennebula-gate
-121d43da2299a8f347dfff2124253617d2d4f175bafe5f14687a58e72ada60f08fbdcba1b5dbdc48434c226a6f75b46eb2e9203f8549733d1393ca348f5a00ff  opennebula-ssh-agent
-a6c33276b527e8aafd39815688dbdf8dbfaa4e1ab5b708e44b48c6b358bba2dd4c2225a7e4647b438a2396ed6fd159a3421fe2798f0f954e250d3bef8a57a742  opennebula.logrotate
-"
diff --git a/opennebula b/opennebula
index e6a48fe..046ef97 100644
--- a/opennebula
+++ b/opennebula
@@ -11,7 +11,9 @@ supervisor="supervise-daemon"
 depend() {
         need mariadb
         after syslog networking localmount netmount
-        want opennebula-scheduler opennebula-hem opennebula-ssh-agent
+        before opennebula-scheduler opennebula-hem opennebula-sunstone \
+        opennebula-flow opennebula-gate
+        # opennebula-ssh-agent
 }
 
 start_pre() {
diff --git a/opennebula-flow b/opennebula-flow
index 5764706..03e3532 100644
--- a/opennebula-flow
+++ b/opennebula-flow
@@ -8,14 +8,8 @@ pidfile="/run/one/${RC_SVCNAME}.pid"
 supervisor="supervise-daemon"
 
 depend() {
-        after syslog networking netmount opennebula
-}
-
-start_pre() {
-        /bin/mkdir -p /var/log/one
-        /bin/mkdir -p /var/lock/one
-        /bin/mkdir -p /run/one
-        /bin/chown $command_user -R /var/log/one /run/one /var/lock/one
+        need opennebula
+        after syslog networking netmount
 }
 
 start() {
diff --git a/opennebula-gate b/opennebula-gate
index 5f8c255..caae19c 100644
--- a/opennebula-gate
+++ b/opennebula-gate
@@ -8,14 +8,8 @@ pidfile="/run/one/${RC_SVCNAME}.pid"
 supervisor="supervise-daemon"
 
 depend() {
-        after syslog networking netmount opennebula
-}
-
-start_pre() {
-        /bin/mkdir -p /var/log/one
-        /bin/mkdir -p /var/lock/one
-        /bin/mkdir -p /run/one
-        /bin/chown $command_user -R /var/log/one /run/one /var/lock/one
+        need opennebula
+        after syslog networking netmount
 }
 
 start() {
diff --git a/opennebula-hem b/opennebula-hem
index 5c87b4b..37d0f23 100644
--- a/opennebula-hem
+++ b/opennebula-hem
@@ -8,14 +8,8 @@ pidfile="/run/one/${RC_SVCNAME}.pid"
 supervisor="supervise-daemon"
 
 depend() {
-        after syslog networking netmount opennebula
-}
-
-start_pre() {
-        /bin/mkdir -p /var/log/one
-        /bin/mkdir -p /var/lock/one
-        /bin/mkdir -p /run/one
-        /bin/chown $command_user -R /var/log/one /run/one /var/lock/one
+        need opennebula
+        after syslog networking netmount
 }
 
 start() {
diff --git a/opennebula-scheduler b/opennebula-scheduler
index b0c43c7..e02fef1 100644
--- a/opennebula-scheduler
+++ b/opennebula-scheduler
@@ -8,14 +8,8 @@ pidfile="/run/one/${RC_SVCNAME}.pid"
 supervisor="supervise-daemon"
 
 depend() {
-        after syslog networking netmount opennebula
-}
-
-start_pre() {
-        /bin/mkdir -p /var/log/one
-        /bin/mkdir -p /var/lock/one
-        /bin/mkdir -p /run/one
-        /bin/chown $command_user -R /var/log/one /run/one /var/lock/one
+        need opennebula
+        after syslog networking netmount
 }
 
 start() {
diff --git a/opennebula-sunstone b/opennebula-sunstone
index d16ba08..a5aebc0 100644
--- a/opennebula-sunstone
+++ b/opennebula-sunstone
@@ -8,7 +8,8 @@ pidfile="/run/one/${RC_SVCNAME}.pid"
 supervisor="supervise-daemon"
 
 depend() {
-        after syslog networking netmount opennebula
+        need opennebula
+        after syslog networking netmount
         want opennebula-novnc
 }