diff --git a/main/postmarketos-base-ui-cage/APKBUILD b/main/postmarketos-base-ui-cage/APKBUILD
index 8285b9854..ad62168d8 100644
--- a/main/postmarketos-base-ui-cage/APKBUILD
+++ b/main/postmarketos-base-ui-cage/APKBUILD
@@ -1,7 +1,7 @@
 maintainer="Vitaliy Ognev <vitaliy.ognev@gmail.com>"
 pkgname=postmarketos-base-ui-cage
 pkgver=6
-pkgrel=0
+pkgrel=1
 pkgdesc="Meta package for shared configuration for cage UIs"
 arch="all"
 url="https://postmarketos.org/"
@@ -30,14 +30,16 @@ depends="
 	cage
 	dbus
 	seatd
-	seatd-openrc
 	elogind
-	elogind-openrc
 	psmisc
 	tinydm
-	tinydm-openrc
 	jq
 "
+depends_openrc="
+	elogind-openrc
+	seatd-openrc
+	tinydm-openrc
+"
 subpackages="$pkgname-openrc"
 
 package() {
@@ -47,13 +49,12 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-
 	mkdir -p "$subpkgdir"
+	default_openrc
 }
 
 sha512sums="
 f9ee9c447e930d1ec12faa20103f15fb14ea5d61e92f6c643a8343d56534d6ce6909d2dd9eaf99796cf8c9909fbfacd9b0d0fa925b71f48ace0113d7a189b39d  cage-ui.desktop
-05444666550bbb5ea9a68352ead6ab0f179bf1e57962921bea093dc66342cf30bc7653290b0636d3258ef2c90294fdae017d4b3da5a6ab7060671ac6dd05a967  cage-ui-session.sh
-47f25992c96486bd2840bd5b549a800ab524090e43234765c8ce4e0cc9ff4dc9f07f8f4883f5a378b5e0bbdf845d99da992b6d26fca8fffb5ed860a06cb32788  cage-ui-autorotate.sh
+a188643971a5bc8421a1d48b14393980cf18250df2afd6247e5fe5533dcccebb164172c080c0bf577621cadfb9f9cf6c7e28390ca6a952f161e4ea4467ac5dbd  cage-ui-session.sh
+5f88b49cd205118224e53f17456a0e6febd9d8ae42e41bed30cea3f400470bdc2ffc11a7ae884ab4a67ed4a4f72a850c887bd460613a087e8fce35a2d62a9d71  cage-ui-autorotate.sh
 "
diff --git a/main/postmarketos-base-ui-cage/cage-ui-autorotate.sh b/main/postmarketos-base-ui-cage/cage-ui-autorotate.sh
index 0dba9777e..635eeff40 100644
--- a/main/postmarketos-base-ui-cage/cage-ui-autorotate.sh
+++ b/main/postmarketos-base-ui-cage/cage-ui-autorotate.sh
@@ -2,7 +2,7 @@
 
 set -ueo pipefail
 
-CONNECTORS=$(drm_info -j 2>/dev/null | jq -rc '[.[].connectors | .[] | select( .status == 1 )]')
+CONNECTORS=$(drm_info -j 2>/dev/null | jq -rc '[.[] | (.connectors // empty) | .[] | select(.status == 1)]')
 
 while read -r CONNECTOR ; do
 	CONNECTOR_ID=$(echo "$CONNECTOR" | jq -rc '.id')
diff --git a/main/postmarketos-base-ui-cage/cage-ui-session.sh b/main/postmarketos-base-ui-cage/cage-ui-session.sh
index 035794264..fbf01737b 100644
--- a/main/postmarketos-base-ui-cage/cage-ui-session.sh
+++ b/main/postmarketos-base-ui-cage/cage-ui-session.sh
@@ -4,12 +4,13 @@
 
 if [ -d /etc/cage-ui ]; then
 	for script in /etc/cage-ui/*.sh; do
+		[ -e "$script" ] || continue
 		# shellcheck source=/dev/null # since we do not control these scripts
 		. "$script"
 	done
 fi
 
-if [ -z "$CAGE_UI_COMMAND" ]; then
+if [ -z "${CAGE_UI_COMMAND:-}" ]; then
 	if command -v postmarketos-demos >/dev/null 2>&1; then
 		CAGE_UI_COMMAND=postmarketos-demos
 	else