diff --git a/main/postmarketos-base-ui-gnome/APKBUILD b/main/postmarketos-base-ui-gnome/APKBUILD
index 5d6b77242..87da57a28 100644
--- a/main/postmarketos-base-ui-gnome/APKBUILD
+++ b/main/postmarketos-base-ui-gnome/APKBUILD
@@ -1,23 +1,17 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-base-ui-gnome
 pkgver=3
-pkgrel=5
+pkgrel=6
 pkgdesc="Meta package for shared configuration for GNOME-based UIs"
 url="https://postmarketos.org"
 arch="noarch"
 license="GPL-3.0-or-later"
 depends="
-	apk-polkit-rs-openrc
 	dnsmasq
-	elogind
-	elogind-openrc
 	gcr-ssh-agent
 	gnome-bluetooth
 	iio-sensor-proxy
-	iio-sensor-proxy-openrc
 	modemmanager
-	modemmanager-openrc
-	polkit-elogind
 	postmarketos-artwork-wallpapers
 	postmarketos-base-ui
 	postmarketos-base-ui-networkmanager
@@ -29,11 +23,11 @@ depends="
 	xdg-user-dirs-gtk
 	xwayland
 	"
-install="$pkgname.post-install $pkgname.post-upgrade"
 source="
 	00_postmarketos-base-ui-gnome.gschema.override
 	"
 options="!check"
+subpackages="$pkgname-openrc $pkgname-systemd"
 
 _pmb_recommends="
 	evince
@@ -59,6 +53,28 @@ package() {
 		"$srcdir"/*.override
 }
 
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="
+		apk-polkit-rs-openrc
+		elogind
+		elogind-openrc
+		iio-sensor-proxy-openrc
+		modemmanager-openrc
+		polkit-elogind
+	"
+
+	mkdir "$subpkgdir"
+}
+
+systemd() {
+	install_if="$pkgname=$pkgver-r$pkgrel systemd"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir -p "$subpkgdir"
+}
+
 sha512sums="
 1f68138876f2270943c88fd6f914f156692397a840f4945564cce0ed6e5d56943661fee025e0e4e0881b5df18a4f5f290086eb67be945e59abd5fe4c71cf5e67  00_postmarketos-base-ui-gnome.gschema.override
 "
diff --git a/main/postmarketos-base-ui-gnome/postmarketos-base-ui-gnome.post-install b/main/postmarketos-base-ui-gnome/postmarketos-base-ui-gnome-openrc.post-install
similarity index 100%
rename from main/postmarketos-base-ui-gnome/postmarketos-base-ui-gnome.post-install
rename to main/postmarketos-base-ui-gnome/postmarketos-base-ui-gnome-openrc.post-install
diff --git a/main/postmarketos-base-ui-gnome/postmarketos-base-ui-gnome-openrc.post-upgrade b/main/postmarketos-base-ui-gnome/postmarketos-base-ui-gnome-openrc.post-upgrade
new file mode 120000
index 000000000..7c1e4f0a8
--- /dev/null
+++ b/main/postmarketos-base-ui-gnome/postmarketos-base-ui-gnome-openrc.post-upgrade
@@ -0,0 +1 @@
+postmarketos-base-ui-gnome-openrc.post-install
\ No newline at end of file
diff --git a/main/postmarketos-base-ui-gnome/postmarketos-base-ui-gnome-systemd.post-install b/main/postmarketos-base-ui-gnome/postmarketos-base-ui-gnome-systemd.post-install
new file mode 100644
index 000000000..9ae97902a
--- /dev/null
+++ b/main/postmarketos-base-ui-gnome/postmarketos-base-ui-gnome-systemd.post-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+systemctl enable bluetooth
+systemctl enable iio-sensor-proxy
+systemctl enable modemmanager
+systemctl enable networkmanager
diff --git a/main/postmarketos-base-ui-gnome/postmarketos-base-ui-gnome-systemd.post-upgrade b/main/postmarketos-base-ui-gnome/postmarketos-base-ui-gnome-systemd.post-upgrade
new file mode 120000
index 000000000..6afbeaa2f
--- /dev/null
+++ b/main/postmarketos-base-ui-gnome/postmarketos-base-ui-gnome-systemd.post-upgrade
@@ -0,0 +1 @@
+postmarketos-base-ui-gnome-systemd.post-install
\ No newline at end of file
diff --git a/main/postmarketos-base-ui-gnome/postmarketos-base-ui-gnome.post-upgrade b/main/postmarketos-base-ui-gnome/postmarketos-base-ui-gnome.post-upgrade
deleted file mode 120000
index df3fd472d..000000000
--- a/main/postmarketos-base-ui-gnome/postmarketos-base-ui-gnome.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-postmarketos-base-ui-gnome.post-install
\ No newline at end of file