diff --git a/APKBUILD b/APKBUILD
index a51aab4..b2fe853 100644
--- a/APKBUILD
+++ b/APKBUILD
@@ -7,43 +7,51 @@ pkgdesc="OpenNebula Server and Scheduler (Community Edition)"
 url="https://opennebula.io/"
 arch="x86_64"
 license="Apache"
-depends="g++
+depends="augeas
+	curl
+	czmq
+	g++
 	gnutls
+	libpq
 	libvncserver
-	shadow
 	libnsl
+	libpg_query"
 	logrotate
-	npm
 	ronn
 	mariadb
 	mariadb-client
 	mariadb-server-utils
+	npm
+	xmlrpc-c
 	libxml2
 	xmlrpc-c
+	openssl
+	ruby
 	ruby-nokogiri
 	ruby-rexml
 	ruby-xmlrpc
 	ruby-bundler
 	ruby-pg
 	ruby-augeas
-	libpg_query"
+	shadow
+	sqlite
 makedepends="alpine-sdk
+	augeas-dev
 	bash
+	czmq-dev
+	gnutls-dev
 	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
diff --git a/opennebula.install b/opennebula.install
deleted file mode 100644
index 45b045b..0000000
--- a/opennebula.install
+++ /dev/null
@@ -1,35 +0,0 @@
-pre-install() {
-	groupadd cloud
-	useradd -m -g cloud -c "OpenNebula administrator account" -s /bin/ash oneadmin
-}
-
-post-install() {
-	# Append the oneadmin credentials to one_auth to avoid overwriting a file
-	# that may already exist
-	usermod -m -d /var/lib/one oneadmin
-	if [ ! -f /var/lib/one/.one/one_auth ]; then
-		mkdir -p /var/lib/one/.one/
-		echo 'oneadmin:0neadm1n' >> /var/lib/one/.one/one_auth
-		echo ">> You must edit the password in /var/lib/one/.one/one_auth"
-	fi
-	chown oneadmin:cloud -R /var/log/one /var/lib/one /run/one /run/lock/one
-	echo ">> To install required gems run as a local user:"
-	echo ">> bundler install --gemfile /usr/share/one/Gemfile"
-}
-
-post-upgrade(){
-  chown oneadmin:cloud -R /var/lib/one/sunstone
-	printf "NOTE: This is may be an major upgrade! If you are not installing from scratch, check the compatibility guide at:\n\n\thttp://docs.opennebula.org/5.10/intro_release_notes/release_notes/compatibility.html\n\thttp://docs.opennebula.org/5.10/intro_release_notes/upgrades/index.html\n"
-	echo ">> To install required gems run as a local user:"
-	echo ">> bundler install --gemfile /usr/share/one/Gemfile"
-}
-
-pre-deinstall() {
-	userdel -r oneadmin && echo ">> User 'oneadmin' has been removed."
-	groupdel cloud && echo ">> Group 'cloud' has been removed."
-}
-
-post-deinstall() {
-	echo ">> You can uninstall the Ruby gems if no other packages require them."
-	echo ">> For example, 'gem uninstall sequel' would uninstall the 'sequel' Ruby gem."
-}