diff --git a/main/postmarketos-base-ui-gnome-mobile/20-volume-keys-input.rules b/main/postmarketos-base-ui-gnome-mobile/20-volume-keys-input.rules
new file mode 100644
index 000000000..0371f64d3
--- /dev/null
+++ b/main/postmarketos-base-ui-gnome-mobile/20-volume-keys-input.rules
@@ -0,0 +1,3 @@
+# prevent from getting woken up by volume up / down in Phosh / Gnome Mobile
+SUBSYSTEM=="input", KERNEL=="event*", \
+ENV{GM_WAKEUP_KEY_114}="0", ENV{GM_WAKEUP_KEY_115}="0"
diff --git a/main/postmarketos-base-ui-gnome-mobile/APKBUILD b/main/postmarketos-base-ui-gnome-mobile/APKBUILD
new file mode 100644
index 000000000..a4b08df1e
--- /dev/null
+++ b/main/postmarketos-base-ui-gnome-mobile/APKBUILD
@@ -0,0 +1,36 @@
+pkgname=postmarketos-base-ui-gnome-mobile
+pkgver=1
+pkgrel=0
+pkgdesc="Meta package for shared configuration for GNOME Mobile and Phosh UIs"
+url="https://postmarketos.org"
+arch="noarch"
+license="GPL-3.0-or-later"
+depends="
+	postmarketos-base-ui-gnome
+	"
+source="
+	20-volume-keys-input.rules
+	"
+options="!check"
+
+_pmb_recommends="
+	calls
+	chatty
+	mobile-config-firefox
+	portfolio
+	postmarketos-default-camera
+	postmarketos-tweaks
+	postmarketos-welcome
+	postprocessd
+	ttyescape
+"
+
+package() {
+	mkdir -p "$pkgdir"
+	install -Dm644 "$srcdir"/20-volume-keys-input.rules \
+		"$pkgdir"/usr/lib/udev/rules.d/20-volume-keys-input.rules
+}
+
+sha512sums="
+767a85bf3ad83b5edaa98add07f960bcaae9c48ee75533ae8b216aa73c453fc928ae599b2598d6c630968dd48314d3bec554c00eda57e9ae99895589430b4399  20-volume-keys-input.rules
+"
diff --git a/main/postmarketos-base-ui-gnome/APKBUILD b/main/postmarketos-base-ui-gnome/APKBUILD
index da0cf845a..af99bd0a6 100644
--- a/main/postmarketos-base-ui-gnome/APKBUILD
+++ b/main/postmarketos-base-ui-gnome/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-base-ui-gnome
 pkgver=3
-pkgrel=11
+pkgrel=12
 pkgdesc="Meta package for shared configuration for GNOME-based UIs"
 url="https://postmarketos.org"
 arch="noarch"
@@ -10,6 +10,7 @@ depends="
 	dnsmasq
 	gcr-ssh-agent
 	gnome-bluetooth
+	gnome-keyring
 	iio-sensor-proxy
 	modemmanager
 	postmarketos-artwork-wallpapers
diff --git a/main/postmarketos-ui-gnome-mobile/APKBUILD b/main/postmarketos-ui-gnome-mobile/APKBUILD
index ef0baa191..077968c22 100644
--- a/main/postmarketos-ui-gnome-mobile/APKBUILD
+++ b/main/postmarketos-ui-gnome-mobile/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=postmarketos-ui-gnome-mobile
 pkgver=2
-pkgrel=6
+pkgrel=7
 pkgdesc="(Wayland) Gnome Shell patched to adapt better to phones (Experimental)"
 url="https://gnome.org/"
 arch="noarch !armhf !riscv64" # gnome-shell / riscv64: mutter-mobile
@@ -15,7 +15,6 @@ depends="
 	gnome-browser-connector
 	gnome-control-center
 	gnome-initial-setup
-	gnome-keyring
 	gnome-online-accounts
 	gnome-remote-desktop
 	gnome-shell-extensions
@@ -26,22 +25,13 @@ depends="
 	networkmanager-elogind
 	pinentry-gnome
 	polkit-gnome
-	postmarketos-base-ui-gnome
+	postmarketos-base-ui-gnome-mobile
 	tracker
 	tracker-miners
 	udisks2
 	"
 _pmb_recommends="
-	calls
-	chatty
 	gnome-extensions-app
-	mobile-config-firefox
-	portfolio
-	postmarketos-default-camera
-	postmarketos-tweaks
-	postmarketos-welcome
-	postprocessd
-	ttyescape
 	"
 subpackages="$pkgname-openrc"
 source="firefox-wayland.sh"
diff --git a/main/postmarketos-ui-phosh/APKBUILD b/main/postmarketos-ui-phosh/APKBUILD
index 4d3e3dab2..539fe905a 100644
--- a/main/postmarketos-ui-phosh/APKBUILD
+++ b/main/postmarketos-ui-phosh/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=postmarketos-ui-phosh
 pkgver=22.3
-pkgrel=10
+pkgrel=11
 pkgdesc="(Wayland) Mobile UI initially developed for the Librem 5"
 url="https://phosh.mobi"
 arch="noarch !armhf"
@@ -14,25 +14,15 @@ depends="
 	!mutter-mobile
 	!mutter-mobile-schemas
 	bluez
-	gnome-keyring
 	phosh
-	postmarketos-base-ui-gnome
+	postmarketos-base-ui-gnome-mobile
 	postmarketos-base-ui-qt-tweaks
 	postmarketos-base-ui-qt-wayland
 	udiskie
 	xdg-desktop-portal-wlr
 	"
 _pmb_recommends="
-	calls
-	chatty
-	mobile-config-firefox
 	phosh-mobile-settings
-	portfolio
-	postmarketos-default-camera
-	postmarketos-tweaks
-	postmarketos-welcome
-	postprocessd
-	ttyescape
 	"
 _pmb_groups="feedbackd"
 install="$pkgname.post-install $pkgname.post-upgrade"