diff --git a/media-libs/alsa-ucm-pinephone/Manifest b/media-libs/alsa-ucm-pinephone/Manifest
old mode 100755
new mode 100644
index 6336cd3..f829340
--- a/media-libs/alsa-ucm-pinephone/Manifest
+++ b/media-libs/alsa-ucm-pinephone/Manifest
@@ -1 +1 @@
-DIST alsa-ucm-pinephone-1.2.6.3.tar.gz 4441 BLAKE2B 5999331e9769c60d1989248749b9c15a6804cf732299d11ea63107fc1afef7715c3ec30e7e1a15ac782e28d72fbb9a6748ae319244cef617ffc5d50d1b54b1b8 SHA512 2ced0519ade14a3865043d4e3cdab58072ab7ec1915f0fcb74dd7ecaa566074fca5f2d63ee9d6e86d013dd45b92da5892f9ec18025855c8d665a327c06212711
+DIST alsa-ucm-pinephone-1.2.6.3.tar.gz 28336 BLAKE2B 1926ea4385ac1ecc42c57195d7903435552ead2ea465cfe6a60b61c4c8687d71d9a4336c5186e1fa500d6df67d7d55e0ad8dbd08260ab554cf3d6be73ba7e610 SHA512 cd0354c0220b22a0624705322508b867dabb38197a9e5ace92c8a58dc3c60e771fe2e6e15ec759def5ddd47cceeb177adc38ddab2fd42b07156351b8f7ed4a9a
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-r1.ebuild
similarity index 66%
rename from media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-1.2.6.3.ebuild
rename to media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-1.2.6.3-r1.ebuild
index 53c7ce0..ca750f1 100755
--- 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-r1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=8
 
-COMMIT="ec0ef36b8b897ed1ae6bb0d0de13d5776f5d3659"
+COMMIT="355d788a6b53bb6b723779c5f791b735f589479d"
 
 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/${MY_PN}/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://gitlab.manjaro.org/manjaro-arm/packages/community/pinephone"
+SRC_URI="https://gitlab.manjaro.org/manjaro-arm/packages/community/pinephone/${MY_PN}/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-alsa-ucm-${COMMIT}"
 
 LICENSE="BSD"
@@ -28,16 +28,16 @@ src_install() {
 	# PinePhone Configs
 	insinto /usr/share/alsa/ucm2/PinePhone/
 	insopts -m644
-	doins "${S}"/ucm2/PinePhone/HiFi.conf
-	doins "${S}"/ucm2/PinePhone/VoiceCall.conf
-	doins "${FILESDIR}"/PinePhone.conf
+	doins "${S}"/HiFi.conf
+	doins "${S}"/VoiceCall.conf
+	doins "${S}"/PinePhone.conf
 
 	# PinePhone Pro Configs
 	insinto /usr/share/alsa/ucm2/PinePhonePro/
 	insopts -m644
-	doins "${S}"/ucm2/PinePhonePro/HiFi.conf
-	doins "${S}"/ucm2/PinePhonePro/VoiceCall.conf
-	doins "${FILESDIR}"/PinePhonePro.conf
+	doins "${S}"/HiFi.conf
+	doins "${S}"/VoiceCall.conf
+	doins "${S}"/PinePhonePro.conf
 
 	# Create Symlinks
 	dosym ../../../PinePhone/PinePhone.conf /usr/share/alsa/ucm2/conf.d/simple-card/PinePhone.conf
diff --git a/media-libs/alsa-ucm-pinephone/files/PinePhone.conf b/media-libs/alsa-ucm-pinephone/files/PinePhone.conf
deleted file mode 100755
index d136c4c..0000000
--- a/media-libs/alsa-ucm-pinephone/files/PinePhone.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-Syntax 2
-
-SectionUseCase."HiFi" {
-	File "/PinePhone/HiFi.conf"
-	Comment "Play HiFi quality music"
-}
-
-SectionUseCase."Voice Call" {
-	File "/PinePhone/VoiceCall.conf"
-	Comment "Make a phone call"
-}
diff --git a/media-libs/alsa-ucm-pinephone/files/PinePhonePro.conf b/media-libs/alsa-ucm-pinephone/files/PinePhonePro.conf
deleted file mode 100755
index 0c146ec..0000000
--- a/media-libs/alsa-ucm-pinephone/files/PinePhonePro.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-Syntax 4
-Comment "PinePhone Pro"
-
-SectionUseCase."HiFi" {
-        File "/PinePhonePro/HiFi.conf"
-        Comment "Play HiFi quality music"
-}
-
-SectionUseCase."Voice Call" {
-        File "/PinePhonePro/VoiceCall.conf"
-        Comment "Make a phone call"
-}
-
-Include.card-init.File "/lib/card-init.conf"
-Include.ctl-remap.File "/lib/ctl-remap.conf"
-Include.codec-init.File "/codecs/rt5640/init.conf"