diff --git a/APKBUILD b/APKBUILD
index 1362cf0..a51aab4 100644
--- a/APKBUILD
+++ b/APKBUILD
@@ -7,64 +7,69 @@ pkgdesc="OpenNebula Server and Scheduler (Community Edition)"
 url="https://opennebula.io/"
 arch="x86_64"
 license="Apache"
-depends="libvncserver
-				gnutls
-				libnsl
-				alpine-sdk
-				linux-headers
-				npm
-				ronn
-				mariadb-server-utils
-				mariadb-client
-				libxml2
-				xmlrpc-c
-				g++
-				ruby-nokogiri
-				ruby-rexml
-				ruby-xmlrpc
-				ruby-bundler
-				ruby-pg
-				ruby-augeas
-				libpg_query"
-makedepends="bash
-						python2
-						libvncserver-dev
-						gnutls-dev
-						libnsl-dev
-						openssl-dev
-						sqlite-dev
-						czmq-dev
-						mariadb-dev
-						ruby-dev
-						libxml2-dev
-						xmlrpc-c-dev
-						scons
-						make
-						augeas-dev
-						curl-dev
-						libpq-dev"
+depends="g++
+	gnutls
+	libvncserver
+	shadow
+	libnsl
+	logrotate
+	npm
+	ronn
+	mariadb
+	mariadb-client
+	mariadb-server-utils
+	libxml2
+	xmlrpc-c
+	ruby-nokogiri
+	ruby-rexml
+	ruby-xmlrpc
+	ruby-bundler
+	ruby-pg
+	ruby-augeas
+	libpg_query"
+makedepends="alpine-sdk
+	bash
+	python2
+	libvncserver-dev
+	linux-headers
+	gnutls-dev
+	libnsl-dev
+	openssl-dev
+	sqlite-dev
+	czmq-dev
+	mariadb-dev
+	ruby-dev
+	libxml2-dev
+	xmlrpc-c-dev
+	scons
+	make
+	augeas-dev
+	curl-dev
+	libpq-dev"
 install="${pkgname}.pre-install
-				${pkgname}.post-install
-				${pkgname}.post-upgrade
-				${pkgname}.pre-deinstall
-				${pkgname}.post-deinstall"
+	${pkgname}.post-install
+	${pkgname}.post-upgrade
+	${pkgname}.pre-deinstall
+	${pkgname}.post-deinstall"
 source="https://github.com/OpenNebula/one/archive/release-${pkgver}.tar.gz
-			 svn.patch
-			 opennebula
-			 opennebula-scheduler
-			 opennebula-novnc
-			 opennebula-sunstone
-			 opennebula-hem
-			 opennebula-flow
-			 opennebula-gate
-			 opennebula-ssh-agent
-			 opennebula.logrotate
-			 "
+	svn.patch
+	opennebula
+	opennebula-scheduler
+	opennebula-novnc
+	opennebula-sunstone
+	opennebula-hem
+	opennebula-flow
+	opennebula-gate
+	opennebula-ssh-agent
+	opennebula.logrotate"
+
 builddir="$srcdir/"
 
 prepare() {
 	cd "one-release-${pkgver}"
 	patch -p0 < "${srcdir}/svn.patch"
+	npm config set prefix '~/.local/'
+	prefix=~/.local/
 	npm config set python python2.7
 	npm install bower grunt -g
 }
@@ -77,14 +82,14 @@ build() {
 package() {
 	cd "one-release-${pkgver}"
 
-	install -D -m644 "${srcdir}/opennebula" "${pkgdir}/etc/init.d/opennebula"
-	install -D -m644 "${srcdir}/opennebula-scheduler" "${pkgdir}/etc/init.d/opennebula-scheduler"
-	install -D -m644 "${srcdir}/opennebula-novnc" "${pkgdir}/etc/init.d/opennebula-novnc"
-	install -D -m644 "${srcdir}/opennebula-sunstone" "${pkgdir}/etc/init.d/opennebula-sunstone"
-	install -D -m644 "${srcdir}/opennebula-hem" "${pkgdir}/etc/init.d/opennebula-hem"
-	install -D -m644 "${srcdir}/opennebula-flow" "${pkgdir}/etc/init.d/opennebula-flow"
-	install -D -m644 "${srcdir}/opennebula-gate" "${pkgdir}/etc/init.d/opennebula-gate"
-	install -D -m644 "${srcdir}/opennebula-ssh-agent" "${pkgdir}/etc/init.d/opennebula-ssh-agent"
+	install -D -m755 "${srcdir}/opennebula" "${pkgdir}/etc/init.d/opennebula"
+	install -D -m755 "${srcdir}/opennebula-scheduler" "${pkgdir}/etc/init.d/opennebula-scheduler"
+	install -D -m755 "${srcdir}/opennebula-novnc" "${pkgdir}/etc/init.d/opennebula-novnc"
+	install -D -m755 "${srcdir}/opennebula-sunstone" "${pkgdir}/etc/init.d/opennebula-sunstone"
+	install -D -m755 "${srcdir}/opennebula-hem" "${pkgdir}/etc/init.d/opennebula-hem"
+	install -D -m755 "${srcdir}/opennebula-flow" "${pkgdir}/etc/init.d/opennebula-flow"
+	install -D -m755 "${srcdir}/opennebula-gate" "${pkgdir}/etc/init.d/opennebula-gate"
+	install -D -m755 "${srcdir}/opennebula-ssh-agent" "${pkgdir}/etc/init.d/opennebula-ssh-agent"
 	install -D -m644 "${srcdir}/opennebula.logrotate" "${pkgdir}/etc/logrotate.d/opennebula.logrotate"
 
 	DESTDIR="${pkgdir}" ./install.sh -u oneadmin -g cloud
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..9386383
--- /dev/null
+++ b/README.md
@@ -0,0 +1,20 @@
+# APKBUILD
+
+```
+# apk add alpine-sdk sudo
+# visudo
+```
+
+```
+# addgroup <yourusername> abuild
+```
+
+```
+# mkdir -p /var/cache/distfiles
+# chmod a+w /var/cache/distfiles
+```
+
+
+```
+abuild-keygen -a -i
+```
diff --git a/opennebula b/opennebula
index 38e1fb5..e6a48fe 100644
--- a/opennebula
+++ b/opennebula
@@ -4,7 +4,7 @@ name=$RC_SVCNAME
 description="OpenNebula management"
 command="/usr/bin/oned"
 command_args="-f"
-command_user="oneadmin:oneadmin"
+command_user="oneadmin:cloud"
 pidfile="/run/one/${RC_SVCNAME}.pid"
 supervisor="supervise-daemon"
 
diff --git a/opennebula-flow b/opennebula-flow
index de87e34..5764706 100644
--- a/opennebula-flow
+++ b/opennebula-flow
@@ -3,7 +3,7 @@
 name=$RC_SVCNAME
 description="OpenNebula Flow Service"
 command="/usr/bin/ruby /usr/lib/one/oneflow/oneflow-server.rb"
-command_user="oneadmin:oneadmin"
+command_user="oneadmin:cloud"
 pidfile="/run/one/${RC_SVCNAME}.pid"
 supervisor="supervise-daemon"
 
diff --git a/opennebula-gate b/opennebula-gate
index d93c80a..5f8c255 100644
--- a/opennebula-gate
+++ b/opennebula-gate
@@ -3,7 +3,7 @@
 name=$RC_SVCNAME
 description="OpenNebula Gate Daemon"
 command="/usr/bin/ruby /usr/lib/one/onegate/onegate-server.rb"
-command_user="oneadmin:oneadmin"
+command_user="oneadmin:cloud"
 pidfile="/run/one/${RC_SVCNAME}.pid"
 supervisor="supervise-daemon"
 
diff --git a/opennebula-hem b/opennebula-hem
index 4450a97..5c87b4b 100644
--- a/opennebula-hem
+++ b/opennebula-hem
@@ -3,7 +3,7 @@
 name=$RC_SVCNAME
 description="OpenNebula Hook Execution Service"
 command="/usr/bin/ruby /usr/lib/one/onehem/onehem-server.rb"
-command_user="oneadmin:oneadmin"
+command_user="oneadmin:cloud"
 pidfile="/run/one/${RC_SVCNAME}.pid"
 supervisor="supervise-daemon"
 
diff --git a/opennebula-novnc b/opennebula-novnc
index 38bc7af..36b4052 100644
--- a/opennebula-novnc
+++ b/opennebula-novnc
@@ -3,7 +3,7 @@
 name=$RC_SVCNAME
 description="OpenNebula noVNC Server"
 command="/usr/bin/novnc-server"
-command_user="oneadmin:oneadmin"
+command_user="oneadmin:cloud"
 supervisor="supervise-daemon"
 
 depend() {
diff --git a/opennebula-scheduler b/opennebula-scheduler
index 7486d33..b0c43c7 100644
--- a/opennebula-scheduler
+++ b/opennebula-scheduler
@@ -3,7 +3,7 @@
 name=$RC_SVCNAME
 description="OpenNebula Cloud Scheduler Daemon"
 command="/usr/bin/mm_sched"
-command_user="oneadmin:oneadmin"
+command_user="oneadmin:cloud"
 pidfile="/run/one/${RC_SVCNAME}.pid"
 supervisor="supervise-daemon"
 
diff --git a/opennebula-ssh-agent b/opennebula-ssh-agent
index 38e1fb5..e6a48fe 100644
--- a/opennebula-ssh-agent
+++ b/opennebula-ssh-agent
@@ -4,7 +4,7 @@ name=$RC_SVCNAME
 description="OpenNebula management"
 command="/usr/bin/oned"
 command_args="-f"
-command_user="oneadmin:oneadmin"
+command_user="oneadmin:cloud"
 pidfile="/run/one/${RC_SVCNAME}.pid"
 supervisor="supervise-daemon"
 
diff --git a/opennebula-sunstone b/opennebula-sunstone
index c092b14..d16ba08 100644
--- a/opennebula-sunstone
+++ b/opennebula-sunstone
@@ -3,7 +3,7 @@
 name=$RC_SVCNAME
 description="OpenNebula Web UI Server"
 command="/usr/bin/ruby /usr/lib/one/sunstone/sunstone-server.rb"
-command_user="oneadmin:oneadmin"
+command_user="oneadmin:cloud"
 pidfile="/run/one/${RC_SVCNAME}.pid"
 supervisor="supervise-daemon"