diff --git a/main/postmarketos-ui-asteroid/APKBUILD b/main/postmarketos-ui-asteroid/APKBUILD
index be6045babcb819fc748f1c45303dd4c30f8e6a11..5012220db95e1b4caaf3f4d362e20628b0f4625c 100644
--- a/main/postmarketos-ui-asteroid/APKBUILD
+++ b/main/postmarketos-ui-asteroid/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-asteroid
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="(Wayland) Smartwatch UI from AsteroidOS"
 url="https://wiki.postmarketos.org/wiki/AsteroidOS"
@@ -14,7 +14,6 @@ depends="
 	"
 # Required to launch
 depends="$depends
-	elogind
 	postmarketos-base-ui
 	tinydm
 	"
@@ -34,12 +33,13 @@ _pmb_recommends="
 	"
 _pmb_groups="users"
 subpackages="$pkgname-openrc"
+install="$pkgname.post-install $pkgname.post-upgrade"
 source="
 	asteroid.desktop
 	asteroid-launcher-wrapper.sh
 	gtk-app-wayland.sh
 	"
-options="!check"
+options="!check pmb:systemd"
 
 package() {
 	install -Dm755 "$srcdir"/asteroid-launcher-wrapper.sh "$pkgdir"/usr/bin/asteroid-launcher-wrapper
@@ -54,6 +54,7 @@ openrc() {
 		bluez-openrc
 		connman-openrc
 		dsme-openrc
+		elogind
 		elogind-openrc
 		mce-openrc
 		tinydm-openrc
diff --git a/main/postmarketos-ui-asteroid/postmarketos-ui-asteroid-openrc.post-install b/main/postmarketos-ui-asteroid/postmarketos-ui-asteroid-openrc.post-install
index f795504a4899ed7055a4f26a45f82cb358b98298..c2d75604b677ffa65a21c7344390f273632fab6f 100644
--- a/main/postmarketos-ui-asteroid/postmarketos-ui-asteroid-openrc.post-install
+++ b/main/postmarketos-ui-asteroid/postmarketos-ui-asteroid-openrc.post-install
@@ -7,4 +7,3 @@ rc-update add mce default
 rc-update add usb-moded default
 rc-update add connman default
 rc-update add dsme default
-tinydm-set-session -s /usr/share/wayland-sessions/asteroid.desktop
diff --git a/main/postmarketos-ui-asteroid/postmarketos-ui-asteroid.post-install b/main/postmarketos-ui-asteroid/postmarketos-ui-asteroid.post-install
new file mode 100644
index 0000000000000000000000000000000000000000..62fd5f49370bcd4ad1f68e5492a0a048f5d97153
--- /dev/null
+++ b/main/postmarketos-ui-asteroid/postmarketos-ui-asteroid.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+tinydm-set-session -s /usr/share/wayland-sessions/asteroid.desktop
diff --git a/main/postmarketos-ui-asteroid/postmarketos-ui-asteroid.post-upgrade b/main/postmarketos-ui-asteroid/postmarketos-ui-asteroid.post-upgrade
new file mode 120000
index 0000000000000000000000000000000000000000..aa6a720a7ff6d769a03bd9f8d898f4a35b5a8d47
--- /dev/null
+++ b/main/postmarketos-ui-asteroid/postmarketos-ui-asteroid.post-upgrade
@@ -0,0 +1 @@
+postmarketos-ui-asteroid.post-install
\ No newline at end of file