diff --git a/device/testing/device-fairphone-fp5/APKBUILD b/device/testing/device-fairphone-fp5/APKBUILD
index 6a8fe1a4d..291c92384 100644
--- a/device/testing/device-fairphone-fp5/APKBUILD
+++ b/device/testing/device-fairphone-fp5/APKBUILD
@@ -2,16 +2,17 @@
 maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-fairphone-fp5
 pkgdesc="Fairphone 5"
-pkgver=10
+pkgver=11
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	alsa-ucm-conf
+	alsa-ucm-conf-qcom-sc7280
 	firmware-fairphone-fp5-adreno
 	firmware-fairphone-fp5-adsp
+	firmware-fairphone-fp5-audio
 	firmware-fairphone-fp5-bluetooth
 	firmware-fairphone-fp5-cdsp
 	firmware-fairphone-fp5-hexagonfs
@@ -38,8 +39,6 @@ source="
 	81-libssc-fairphone-fp5.rules
 	deviceinfo
 	modules-initfs
-	ucm/HiFi.conf
-	ucm/fp5.conf
 	"
 build() {
 	devicepkg_build $startdir $pkgname
@@ -50,14 +49,6 @@ package() {
 
 	install -Dm644 "$srcdir"/81-libssc-fairphone-fp5.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/81-libssc-fairphone-fp5.rules
-
-	# ALSA Use Case Manager configuration
-	install -Dm644 -t "$pkgdir"/usr/share/alsa/ucm2/Fairphone/fp5 \
-		"$srcdir"/HiFi.conf \
-		"$srcdir"/fp5.conf
-	mkdir -p "$pkgdir"/usr/share/alsa/ucm2/conf.d/qcm6490
-	ln -s /usr/share/alsa/ucm2/Fairphone/fp5/fp5.conf \
-		"$pkgdir"/usr/share/alsa/ucm2/conf.d/qcm6490/Fairphone\ 5.conf
 }
 
 openrc() {
@@ -72,6 +63,4 @@ sha512sums="
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-fairphone-fp5.rules
 8577d77e9e5fe4981f9800fb361ade934d724bd477b530f5f1c237b529704a450490fa9e045d3e5fb9e998260b89c10e8b633ccee4c411715bee932301b64e4b  deviceinfo
 6280b66b9d4843ef78d0029c31d267b0bf59ea669bc3f2c268edfddf4edb3cec62d40b97c8204c85d1350759ad56e1ac2a5ba8ddc691f73c35c7385350ef12ee  modules-initfs
-f39b6e5de6d9bfefc841e887b92bb5a92d02d1de46fd376ca83871b7a9cf0da5297d7201457b2bb12c302887bb0a9d328604ff910ebda8022ac71ad120b11a3c  HiFi.conf
-fb510ca806fb76174576218f5cb4d799e05757b3e351eec32b1406bcf22540cf27888f30e3737f016d43e3c38dea8d7418c194e12c9879df9c756d4d80ceae99  fp5.conf
 "
diff --git a/device/testing/device-fairphone-fp5/ucm/HiFi.conf b/device/testing/device-fairphone-fp5/ucm/HiFi.conf
deleted file mode 100644
index ec7c641a3..000000000
--- a/device/testing/device-fairphone-fp5/ucm/HiFi.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Use case configuration for Fairphone 5
-# Author: Luca Weiss <luca.weiss@fairphone.com>
-
-SectionVerb {
-	EnableSequence [
-		cset "name='DISPLAY_PORT_RX Audio Mixer MultiMedia1' 1"
-	]
-
-	DisableSequence [
-		cset "name='DISPLAY_PORT_RX Audio Mixer MultiMedia1' 0"
-	]
-
-	Value {
-		TQ "HiFi"
-	}
-}
-
-SectionDevice."DisplayPort" {
-	Comment "DisplayPort playback"
-
-	Value {
-		PlaybackPCM "hw:${CardId},0"
-		JackControl "HDMI Jack"
-	}
-}
diff --git a/device/testing/device-fairphone-fp5/ucm/fp5.conf b/device/testing/device-fairphone-fp5/ucm/fp5.conf
deleted file mode 100644
index bd8d21bf9..000000000
--- a/device/testing/device-fairphone-fp5/ucm/fp5.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Use case configuration for Fairphone 5
-# Author: Luca Weiss <luca.weiss@fairphone.com>
-
-Syntax 3
-
-SectionUseCase."HiFi" {
-	File "/Fairphone/fp5/HiFi.conf"
-	Comment "HiFi quality Music."
-}