diff --git a/device/community/soc-qcom-msm8916/APKBUILD b/device/community/soc-qcom-msm8916/APKBUILD
index 1c79fb2b5..4b9b41963 100644
--- a/device/community/soc-qcom-msm8916/APKBUILD
+++ b/device/community/soc-qcom-msm8916/APKBUILD
@@ -1,26 +1,37 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=soc-qcom-msm8916
 pkgdesc="Common package for Qualcomm MSM8916 devices"
-pkgver=8
+pkgver=9
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64 armv7"
 options="!check !archcheck !tracedeps pmb:cross-native"
-depends="alsa-ucm-conf mesa-dri-gallium"
-subpackages="$pkgname-modem"
+depends="mesa-dri-gallium $pkgname-ucm"
+subpackages="$pkgname-ucm $pkgname-modem"
 
 _ucm_commit="c34a73dc0714834d2d2ff5ae304e20b7d93c4c98"
 source="$pkgname-$_ucm_commit.tar.gz::https://github.com/msm8916-mainline/alsa-ucm-conf/archive/$_ucm_commit.tar.gz
 	q6voiced.conf
 	"
 
-_devices="bq-paella msm8916 samsung-a2015 samsung-gt510 wt88047 xiaomi-mido"
 package() {
-	cd "$srcdir/alsa-ucm-conf-$_ucm_commit"/ucm2
-	find $_devices codecs/msm8916-wcd platforms/msm8916 \
-		-type f -name "*.conf" \
-		-exec install -Dm644 {} "$pkgdir"/usr/share/alsa/ucm2/{} \;
+	# parent package is empty
+	mkdir -p "$pkgdir"
+}
+
+# Upstream keeps making breaking changes to UCM in patch releases.
+# My last upstreaming efforts failed without ever getting a reply,
+# since then UCM was entirely reworked like 3 times already...
+# I don't want to fix this up every few months, so let's package a stable
+# version for now. Once all the UCM refactoring upstream has settled down a bit
+# we can investigate how to integrate it properly for upstreaming.
+ucm() {
+	provides="alsa-ucm-conf"
+
+	cd "$srcdir/alsa-ucm-conf-$_ucm_commit"
+	mkdir -p "$subpkgdir"/usr/share/alsa
+	cp -r ucm2 "$subpkgdir"/usr/share/alsa
 }
 
 modem() {