diff --git a/main/postmarketos-ui-sxmo-de-sway/APKBUILD b/main/postmarketos-ui-sxmo-de-sway/APKBUILD
index 540938ac0..131e4a31b 100644
--- a/main/postmarketos-ui-sxmo-de-sway/APKBUILD
+++ b/main/postmarketos-ui-sxmo-de-sway/APKBUILD
@@ -5,7 +5,7 @@
 # Co-Maintainer: Aren Moynihan <aren@peacerevolution.org>
 pkgname=postmarketos-ui-sxmo-de-sway
 pkgver=1.17.1 # Bump this so the file names in bpo are correct
-pkgrel=4
+pkgrel=5
 pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on sway"
 url="http://sr.ht/~mil/Sxmo"
 # riscv64: builder currently stuck, libphonenumber needs rebuild
@@ -18,14 +18,6 @@ depends="
 
 	sxmo-utils-sway
 	sxmo-utils-audio-bluetooth
-
-	openrc
-	seatd-openrc
-	tinydm-openrc
-	modemmanager-openrc
-	networkmanager-openrc
-	bluez-openrc
-	iio-sensor-proxy-openrc
 	"
 install="
 	$pkgname.post-install
@@ -48,9 +40,26 @@ _pmb_recommends="
 	"
 provides="postmarketos-ui-sxmo"
 provider_priority=10
-options="!check pmb:systemd-never"
+options="!check"
+subpackages="$pkgname-openrc"
 
 package() {
 	mkdir -p "$pkgdir"
 	mkdir -p "$pkgdir"/etc/sway/config.d
 }
+
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="
+		openrc
+		seatd-openrc
+		tinydm-openrc
+		modemmanager-openrc
+		networkmanager-openrc
+		bluez-openrc
+		iio-sensor-proxy-openrc
+	"
+
+	mkdir "$subpkgdir"
+}
diff --git a/main/postmarketos-ui-sxmo-de-sway/postmarketos-ui-sxmo-de-sway-openrc.post-install b/main/postmarketos-ui-sxmo-de-sway/postmarketos-ui-sxmo-de-sway-openrc.post-install
new file mode 100644
index 000000000..b867eebad
--- /dev/null
+++ b/main/postmarketos-ui-sxmo-de-sway/postmarketos-ui-sxmo-de-sway-openrc.post-install
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+tinydm-set-session -s /usr/share/wayland-sessions/swmo.desktop
+
+rc-update add seatd default
+rc-update add modemmanager default
+rc-update add tinydm default
+rc-update add networkmanager default
+rc-update add bluetooth default
+rc-update add iio-sensor-proxy default
diff --git a/main/postmarketos-ui-sxmo-de-sway/postmarketos-ui-sxmo-de-sway-openrc.post-upgrade b/main/postmarketos-ui-sxmo-de-sway/postmarketos-ui-sxmo-de-sway-openrc.post-upgrade
new file mode 120000
index 000000000..25011ef4e
--- /dev/null
+++ b/main/postmarketos-ui-sxmo-de-sway/postmarketos-ui-sxmo-de-sway-openrc.post-upgrade
@@ -0,0 +1 @@
+postmarketos-ui-sxmo-de-sway-openrc.post-install
\ No newline at end of file
diff --git a/main/postmarketos-ui-sxmo-de-sway/postmarketos-ui-sxmo-de-sway.post-install b/main/postmarketos-ui-sxmo-de-sway/postmarketos-ui-sxmo-de-sway.post-install
index b867eebad..fe713dd11 100644
--- a/main/postmarketos-ui-sxmo-de-sway/postmarketos-ui-sxmo-de-sway.post-install
+++ b/main/postmarketos-ui-sxmo-de-sway/postmarketos-ui-sxmo-de-sway.post-install
@@ -1,10 +1,3 @@
 #!/bin/sh
 
 tinydm-set-session -s /usr/share/wayland-sessions/swmo.desktop
-
-rc-update add seatd default
-rc-update add modemmanager default
-rc-update add tinydm default
-rc-update add networkmanager default
-rc-update add bluetooth default
-rc-update add iio-sensor-proxy default