diff --git a/ilot/authentik/APKBUILD b/ilot/authentik/APKBUILD
index e9a9324..d48a4f5 100644
--- a/ilot/authentik/APKBUILD
+++ b/ilot/authentik/APKBUILD
@@ -213,7 +213,7 @@ build() {
 }
 
 check() {
-	msg "Setting up test environments"
+	msg "Starting postgresql"
 	export POSTGRES_DB=authentik
 	export POSTGRES_USER=authentik
 	export POSTGRES_PASSWORD="EK-5jnKfjrGRm<77"
@@ -250,66 +250,55 @@ with open(\"local.env.yml\", \"w\") as _config:
 	# no selenium package
 	pip install selenium drf_jsonschema_serializer pdoc --break-system-packages
 
-	msg "Starting tests"
 	make test
-	
-	# TODO: Fix go-tests
-	# make go-test
+	make go-test
 }
 
 package() {
 	msg "Packaging $pkgname"
-	local destdir="$pkgdir"/usr/share/webapps/authentik
+	mkdir -p "$pkgdir"/usr/share/webapps/authentik/web
+	mkdir -p "$pkgdir"/usr/share/webapps/authentik/website
+	mkdir -p "$pkgdir"/var/lib/authentik
+	mkdir -p "$pkgdir"/usr/share/doc
+	mkdir -p "$pkgdir"/usr/bin
+	cp -dr "$builddir"/authentik "$pkgdir"/usr/share/webapps/authentik
+	cp -dr "$builddir"/web/dist "$pkgdir"/usr/share/webapps/authentik/web/dist
+	cp -dr "$builddir"/web/authentik "$pkgdir"/usr/share/webapps/authentik/web/authentik
+	cp -dr "$builddir"/website/build "$pkgdir"/usr/share/doc/authentik
+	cp -dr "$builddir"/tests "$pkgdir"/usr/share/webapps/authentik/tests
+	cp -dr "$builddir"/lifecycle "$pkgdir"/usr/share/webapps/authentik/lifecycle
+	cp -dr "$builddir"/locale "$pkgdir"/usr/share/webapps/authentik/locale
+	cp -dr "$builddir"/blueprints "$pkgdir"/var/lib/authentik/blueprints
+	install -Dm755 "$builddir"/manage.py "$pkgdir"/usr/share/webapps/authentik/manage.py
+	install -Dm755 "$builddir"/server "$pkgdir"/usr/share/webapps/authentik/server
+	ln -s "/etc/authentik/config.yml" "$pkgdir"/usr/share/webapps/authentik/local.env.yml
 
-	# authentik install
-	install -d -m755 \
-		"$destdir" \
-		"$destdir"/web \
-		"$pkgdir"/usr/bin \
-		"$pkgdir"/usr/share/doc
+	install -Dm755 "$builddir"/proxy "$pkgdir"/usr/bin/authentik-proxy
+	install -Dm755 "$builddir"/ldap "$pkgdir"/usr/bin/authentik-ldap
+	install -Dm755 "$builddir"/radius "$pkgdir"/usr/bin/authentik-radius
 
-	cp -rl authentik lifecycle locale tests blueprints web/dist web/authentik \
-		"$destdir"/
-
-	cp -rl web/dist web/authentik \
-		"$destdir"/web/
-
-	install -m755 -t "$destdir" \
-		"$builddir"/server \
-		"$builddir"/ldap \
-		"$builddir"/radius \
-		"$builddir"/proxy \
-		"$builddir"/manage.py
-
-	cp -rl website/build "$pkgdir"/usr/share/doc/
-
-	# symbolic bin links to usr/bin
-	for i in server proxy ldap radius; do
-		ln -s "$destdir"/$i "$pkgdir"/usr/bin/authentik-$i
-	done
-
-	# openrc install
-	for i in $pkgname $pkgname-worker $pkgname-ldap; do
-		install -Dm755 "$srcdir"/$i.openrc "$pkgdir"/etc/init.d/$i
-	done
-
-	# config file setup
+	install -Dm755 "$srcdir"/$pkgname.openrc \
+		"$pkgdir"/etc/init.d/$pkgname
+	install -Dm755 "$srcdir"/$pkgname-worker.openrc \
+		"$pkgdir"/etc/init.d/$pkgname-worker
+	install -Dm755 "$srcdir"/$pkgname-ldap.openrc \
+		"$pkgdir"/etc/init.d/$pkgname-ldap
+	install -Dm640 "$srcdir"/$pkgname-ldap.conf \
+		"$pkgdir"/etc/conf.d/$pkgname-ldap
 	install -Dm640 "$builddir"/authentik/lib/default.yml \
 		"$pkgdir"/etc/authentik/config.yml
-	ln -s "/etc/authentik/config.yml" "$pkgdir"/usr/share/webapps/authentik/local.env.yml
 	chown root:www-data "$pkgdir"/etc/authentik/config.yml
 
+	mv "$pkgdir"/usr/share/webapps/authentik/web/dist/custom.css "$pkgdir"/etc/authentik/custom.css
+	ln -s "/etc/authentik/custom.css" "$pkgdir"/usr/share/webapps/authentik/web/dist/custom.css
+	chown root:www-data "$pkgdir"/etc/authentik/custom.css
+
 	sed -i 's|cert_discovery_dir.*|cert_discovery_dir: /var/lib/authentik/certs|' "$pkgdir"/etc/authentik/config.yml
 	sed -i 's|blueprints_dir.*|blueprints_dir: /var/lib/authentik/blueprints|' "$pkgdir"/etc/authentik/config.yml
 	sed -i 's|template_dir.*|template_dir: /var/lib/authentik/templates|' "$pkgdir"/etc/authentik/config.yml
 	printf "\ncsrf:\n  trusted_origins: ['auth.example.com']" >> "$pkgdir"/etc/authentik/config.yml
 	printf "\nsecret_key: '@@SECRET_KEY@@'" >> "$pkgdir"/etc/authentik/config.yml
 
-	# custom css location change
-	mv "$pkgdir"/usr/share/webapps/authentik/web/dist/custom.css "$pkgdir"/etc/authentik/custom.css
-	ln -s "/etc/authentik/custom.css" "$pkgdir"/usr/share/webapps/authentik/web/dist/custom.css
-	chown root:www-data "$pkgdir"/etc/authentik/custom.css
-
 	# Install wrapper script to /usr/bin.
 	install -m755 -D "$srcdir"/authentik-manage.sh "$pkgdir"/usr/bin/authentik-manage
 }