diff --git a/device/archived/device-samsung-a6lte-downstream/APKBUILD b/device/archived/device-samsung-a6lte-downstream/APKBUILD
index 147eae752..30e346856 100644
--- a/device/archived/device-samsung-a6lte-downstream/APKBUILD
+++ b/device/archived/device-samsung-a6lte-downstream/APKBUILD
@@ -89,9 +89,9 @@ f9716fc70bf3508d2f9e83d908f1c13103403f01ebb784acec6cdf3e959e92b63c75e49b0120abe1
 861270c6bc0b2a3e6cd389c21c8c895e62de8cf8bec6fcf23c178f8cbaae855d62b0ee98692671ab4f518d84cb43dd0b2fe46f5a609f65af6a6c06e0fdbb6d0c  etc-lightdm-lightdm.conf
 ef24527b13e48a9153643f3713167d3d08486e7de8b4c94d7c446ff380396115890573d8cd4aa5448766d9e779e189833a83e7921081679bd348c3f8a59410af  etc-NetworkManager-conf.d-swlan0-unmanaged.conf
 5c3a692f22a29fca792c114c6d94ff1bf0d6921f068f207a2894a8f99c73dcc319e7c803ed7adfe64eb3e60088f37e2a2730118b2ed57aa01b35415664085567  etc-NetworkManager-conf.d-wlan0-preserve-mac.conf
-abe1c4a2f59fe862cebef75c54b8806bd86ce06aeb15d8c0699ab1338c9d575cb72a4d5b099f94272b1d9c9c3f4960af209a9e058ea9e57733b7d905dad0d33f  usr-libexec-samsungipcd-voicecall.sh
+010046035478f56ff3eca1cd40dd5f625a0bf1d05acd6a88cb4906c9ea028ac3cb213bb809371e6f45ba8e6a897e9f00ed1449bd18903cea8b1ac3a1ed3a5072  usr-libexec-samsungipcd-voicecall.sh
 2169590d10d6123575d43e8ff7dc0d2ba824f8266d9fa75a5b59a4cc5753e47e327368b777082930d6b7a7aed6f57fa6ac2c5a2e816e1e12cd1032a8bb1822b5  usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf
-dc528deb556906adfb89b02b6faa04a8b21358706bb60e2fa51c8a3c909b680fcc02fa425b0cb5d6273595f27dfc9b640e1a8d455657fd6b47652af9e8ec295a  usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf
-3e74de3504f134a2726ee87740c5803bbd578352674d1d7de8b9460e57553100e9c4d322143ee83d3d584884c52eef47762bed41814ff1fca8cd9c4552f39b73  usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf
+478983dffd484deb2037ab530bd181c784205e3f297484b0a8938a55d232eb2f35775c475ff913c7547726612036a7935c104950ba983ee263be300cda4b277a  usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf
+38fb210d19be6e14a6936b2d4383e3e853d5382b0ea59cd3f8e185aaa48189f92a6b05c039d2fb7bc036445b8ad91ea5234e55f1cccb805e95a3fb1410e14e13  usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf
 be561f0573c73bdcf37fbd8e4659e92577a0818aafb75d73e7cbf1dd8980f29313170703074ee0cc9cc5b5a07cd7ac8ced07dfdc77b0b31a0cd34d66ae0473a4  usr-share-wireplumber-wireplumber.conf.d-headroom.conf
 "
diff --git a/device/archived/device-samsung-a6lte-downstream/usr-libexec-samsungipcd-voicecall.sh b/device/archived/device-samsung-a6lte-downstream/usr-libexec-samsungipcd-voicecall.sh
index d412ecd87..fdc44306c 100644
--- a/device/archived/device-samsung-a6lte-downstream/usr-libexec-samsungipcd-voicecall.sh
+++ b/device/archived/device-samsung-a6lte-downstream/usr-libexec-samsungipcd-voicecall.sh
@@ -8,11 +8,13 @@
 # Put ourselves into a PID namespace. This is an easy and non-racey way to
 # ensure that all child processes get killed on our exit.
 if [ "$$" != 1 ]; then
-	unshare -p sh "$0"
+	unshare -f -p sh "$0"
 	exitcode="$?"
 	# Restore MIC1 state to normal. We should be the only entity fiddling
 	# with that.
 	amixer -D sysdefault cset name='MIC1 MIC1 On' 1
+	# Workaround for https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/813
+	mmcli -m 0 --voice-hangup-all
 	exit "$exitcode"
 fi
 
@@ -43,7 +45,7 @@ for i in /run/user/*/; do
 		# Report microphone mute events
 		( echo; pactl subscribe; ) | while read; do pactl get-source-mute @DEFAULT_SOURCE@; done
 	' "$(grep "^[^:]*:[^:]*:$(basename "$i"):" /etc/passwd | cut -d : -f 1-1)" &
-done | while read line; do
+done | uniq | while read line; do
 	if [[ "$line" == "Mute: yes" ]]; then
 		amixer -D sysdefault cset name='MIC1 MIC1 On' 0
 	elif [[ "$line" == "Mute: no" ]]; then
diff --git a/device/archived/device-samsung-a6lte-downstream/usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf b/device/archived/device-samsung-a6lte-downstream/usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf
index 70c4bce20..1027821b8 100644
--- a/device/archived/device-samsung-a6lte-downstream/usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf
+++ b/device/archived/device-samsung-a6lte-downstream/usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf
@@ -40,4 +40,8 @@ SectionDefaults [
 	cset "name='MIC2 MIC2 On' 0"
 	cset "name='MIC3 MIC3 On' 0"
 	cset "name='LINEIN LINEIN On' 0"
+	cset 'name="AudioMixer CH1 I2S Data Length" 3'
+	cset 'name="AudioMixer CH1 XFS" 2'
+	cset 'name="AudioMixer CH2 I2S Data Length" 0'
+	cset 'name="AudioMixer CH2 XFS" 0'
 ]
diff --git a/device/archived/device-samsung-a6lte-downstream/usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf b/device/archived/device-samsung-a6lte-downstream/usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf
index f14920e48..4f23b7126 100644
--- a/device/archived/device-samsung-a6lte-downstream/usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf
+++ b/device/archived/device-samsung-a6lte-downstream/usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf
@@ -4,10 +4,10 @@ SectionVerb {
 		cset 'name="AudioMixer CH2 Mixer En" 1'
 		cset 'name="AudioMixer CH1 DOUT Select" 2'
 		cset 'name="AudioMixer CH2 DOUT Select" 1'
-		cset 'name="AudioMixer CH1 I2S Data Length" 0'
-		cset 'name="AudioMixer CH1 XFS" 1'
-		cset 'name="AudioMixer CH2 I2S Data Length" 0'
-		cset 'name="AudioMixer CH2 XFS" 0'
+		#cset 'name="AudioMixer CH1 I2S Data Length" 0'
+		#cset 'name="AudioMixer CH1 XFS" 1'
+		#cset 'name="AudioMixer CH2 I2S Data Length" 0'
+		#cset 'name="AudioMixer CH2 XFS" 0'
 		cset 'name="AMP Enable Switch" 0'
 		cset 'name="EP EP On" 1'
 		cset 'name="EP Mixer DACL Switch" 1'