diff --git a/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-1.2.6.3.ebuild b/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-1.2.6.3.ebuild
index 726f148..53c7ce0 100644
--- a/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-1.2.6.3.ebuild
+++ b/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-1.2.6.3.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 COMMIT="ec0ef36b8b897ed1ae6bb0d0de13d5776f5d3659"
 
+MY_PN="pine64-alsa-ucm"
 DESCRIPTION="ALSA ucm configuration files for the PinePhone (Pro)"
 HOMEPAGE="https://gitlab.com/pine64-org/pine64-alsa-ucm"
-SRC_URI="https://gitlab.com/pine64-org/pine64-alsa-ucm/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://gitlab.com/pine64-org/${MY_PN}/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-alsa-ucm-${COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -18,45 +20,26 @@ RDEPEND="
 	>=media-libs/alsa-lib-1.2.6
 	>=media-plugins/alsa-plugins-1.2.6
 	>=media-libs/alsa-ucm-conf-1.2.6
-	"
-
+	>=media-video/pipewire-0.3.42
+"
 DEPEND="${RDEPEND}"
 
-BDEPEND="${RDEPEND}"
-
-S="${WORKDIR}/pine64-alsa-ucm-${COMMIT}"
-
 src_install() {
-	#PinePhone Configs
+	# PinePhone Configs
 	insinto /usr/share/alsa/ucm2/PinePhone/
 	insopts -m644
 	doins "${S}"/ucm2/PinePhone/HiFi.conf
-
-	insinto /usr/share/alsa/ucm2/PinePhone/
-	insopts -m644
 	doins "${S}"/ucm2/PinePhone/VoiceCall.conf
-
-	insinto /usr/share/alsa/ucm2/PinePhone/
-	insopts -m644
 	doins "${FILESDIR}"/PinePhone.conf
 
-	#PinePhone Pro Configs	
+	# PinePhone Pro Configs
 	insinto /usr/share/alsa/ucm2/PinePhonePro/
 	insopts -m644
 	doins "${S}"/ucm2/PinePhonePro/HiFi.conf
-
-	insinto /usr/share/alsa/ucm2/PinePhonePro/
-	insopts -m644
 	doins "${S}"/ucm2/PinePhonePro/VoiceCall.conf
-
-	insinto /usr/share/alsa/ucm2/PinePhonePro/
-	insopts -m644
 	doins "${FILESDIR}"/PinePhonePro.conf
 
-	#Create Symlinks
-	dosym /usr/share/alsa/ucm2/PinePhone/PinePhone.conf \
-	        /usr/share/alsa/ucm2/conf.d/simple-card/PinePhone.conf
-
-	dosym /usr/share/alsa/ucm2/PinePhonePro/PinePhonePro.conf \
-	        /usr/share/alsa/ucm2/conf.d/simple-card/PinePhonePro.conf
+	# Create Symlinks
+	dosym ../../../PinePhone/PinePhone.conf /usr/share/alsa/ucm2/conf.d/simple-card/PinePhone.conf
+	dosym ../../../PinePhonePro/PinePhonePro.conf /usr/share/alsa/ucm2/conf.d/simple-card/PinePhonePro.conf
 }