diff --git a/device/main/device-pine64-pinephone/APKBUILD b/device/main/device-pine64-pinephone/APKBUILD
index c105dc016..179bb1b74 100644
--- a/device/main/device-pine64-pinephone/APKBUILD
+++ b/device/main/device-pine64-pinephone/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Arnav Singh <me@arnavion.dev>
 # Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
 pkgname=device-pine64-pinephone
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
@@ -29,7 +29,7 @@ depends="
 	eg25-manager
 	eg25-manager-openrc
 	iw
-	linux-postmarketos-allwinner>=5.14
+	linux-postmarketos-allwinner>=6.8
 	mesa-egl
 	postmarketos-base
 	u-boot-pinephone>=2021.01_git20201228-r2
@@ -270,9 +270,9 @@ d66ecef1fa5481ff138fe4e12b194903ceacab9d0649e716049f32e56ec6d9be09b97e2ff769ebc5
 1f573b4a6686dac30b6e20507ec6590764a9e9e60c5373bda3838b1f25370b447a3220670710c43a64eb518a4aa54d4ab3beb942513ef269e596a73653c6528e  sun50i-a64-psci.dts
 3c5c7cb57dee019fbc53b40023097f39be08bbaabd111d9d0b71c2d6190280bcbc54a98506cce5640aa064747d6eeb63a9bc3defdddf41ddc16c123112ad35ee  uboot-script.cmd
 f28902517bebe16f7ddbdbf9f4c52d5c97319e3b5ba7326ba96ed0e094d3d2a39c87061326893cdc34336bbfd56de084b2f217918ebba7ca6a080088cd0bd409  uboot-user.cmd
-f963898fa2ce66bc830e56feeec6ffc9888834e14cc1591d72908ef45ad82532bc3ef5fb32413e07b6722749c9d03e7cf92f06f1fcb859c38b9297cf58e5cedd  HiFi.conf
+e6eff26432814240ba1a5ba32426e4bb0156421c7fad34a978025cb5114523ce9447a4d7fc5a1d19941ef7ca5169927bbb976a39ba0771f76b55d0dd59af64d1  HiFi.conf
 4b0c51ab169aebe8177c5c43eba41afa90370098a5a54e710d17e97ec1651869a20cb5d780a6132028c864916609e3b4f4a13158835310d0441bdb4915872372  PinePhone.conf
-e093f71c37370927468de35a987150a3db3e1cc1c76c144bf58918a09c688c3da84303b5533241e691a6aa0758589e2a6498b1097974117782e909f0bbc6bf71  VoiceCall.conf
+1a2e84251e06720b75c56bcd45588a44161609ce5f1f7eef61d62c91c1d8d0741ac5d8cec7b4692e8de6c9435f276240ac7e558d777c9f61370632bae3454604  VoiceCall.conf
 43f67e94491791685cdbb4874bb3034b1d297bdf3d23e7405c45ba8c58de72b4fb6a9943b79f46ef7b8f4dbc4d9db254ebec8eb3453d720a5a8fad277c6a9d88  ppkb.sh
 bb11151e246d16e071761ebb35ca7f8b8cedbad8366e9bac6aed30554a795877cc9dccbe69ecca4b19b6f72bd87e613705f3ae4f2f40d2f9c2d09cc179999d59  sway-pinephone-keyboard.conf
 a7b49a638f664f7682ce6b00eb4d1ae26a429e89354056de05fb49d25fc9555d7f80e6d8f4b0a250878a4e7823860fd156068ed6604ce6cf58badef45c545161  x11-pinephone-keyboard.conf
diff --git a/device/main/device-pine64-pinephone/ucm/HiFi.conf b/device/main/device-pine64-pinephone/ucm/HiFi.conf
index 99500d294..f53f9f536 100644
--- a/device/main/device-pine64-pinephone/ucm/HiFi.conf
+++ b/device/main/device-pine64-pinephone/ucm/HiFi.conf
@@ -137,6 +137,6 @@ SectionDevice."Headphones" {
 		PlaybackChannels 2
 		PlaybackPriority 500
 		PlaybackPCM "hw:${CardId},0"
-		JackControl "Headphone Jack"
+		JackControl "1c22e00.codec-jack Jack"
 	}
 }
diff --git a/device/main/device-pine64-pinephone/ucm/VoiceCall.conf b/device/main/device-pine64-pinephone/ucm/VoiceCall.conf
index 81d3583db..9bf0bbf8a 100644
--- a/device/main/device-pine64-pinephone/ucm/VoiceCall.conf
+++ b/device/main/device-pine64-pinephone/ucm/VoiceCall.conf
@@ -142,6 +142,6 @@ SectionDevice."Headphones" {
 		PlaybackChannels 2
 		PlaybackPriority 500
 		PlaybackPCM "hw:${CardId},0"
-		JackControl "Headphone Jack"
+		JackControl "1c22e00.codec-jack Jack"
 	}
 }