diff --git a/device/testing/linux-postmarketos-qcom-msm8916/APKBUILD b/device/testing/linux-postmarketos-qcom-msm8916/APKBUILD
index a25befd43..4e4ae8502 100644
--- a/device/testing/linux-postmarketos-qcom-msm8916/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-msm8916/APKBUILD
@@ -6,7 +6,7 @@ pkgver=6.12.1
 # When making kernel config changes please also submit a PR to
 # https://github.com/msm8916-mainline/linux/blob/master/kernel/configs/pmos.config
 # since the kernel config is regenerated on upgrades and all changes will be lost!
-pkgrel=3
+pkgrel=4
 pkgdesc="Mainline kernel fork for Qualcomm MSM8909/MSM8916/MSM8939 devices"
 arch="aarch64 armv7"
 url="https://github.com/msm8916-mainline/linux"
@@ -92,6 +92,6 @@ package() {
 
 sha512sums="
 e46fecfdab77f26c5127ddfd057d31bdf441da7fbf233cd574b396e762ea8992af65f577c595bab6761d1d339016733eb3ab652bf3a221e8b1f6bad4aa6adef5  linux-postmarketos-qcom-msm8916-v6.12.1-msm8916.tar.gz
-2935a10166e0e8840b962ffe2062dcc2c49e925496e9269741f40d21c2e3b56e02292818f66a5192e3ee07b50ebf763eaf7223cb08044c4f63707859d83e8f3f  config-postmarketos-qcom-msm8916.aarch64
-3f64dbece4fe6c7c343162075a6abb1ffa34ca5a2857971c2051b88516569d468c5626b9f981bb4c2439e7b6649e61fae9c9cd3246ed2e0052ef180a1fb06336  config-postmarketos-qcom-msm8916.armv7
+72c7e67bcf67f09975975fb120a01af061032102b8c677a52fa0c8ff4c89c2611b4f4bf56dd8a04f065379c50bdcb6ff755b70f16b4ffed25f9dae85b736eb2d  config-postmarketos-qcom-msm8916.aarch64
+1ccea961dbd63ea720c2546986a2c9d6b77bcd6e3db76fc672aeccd0d1a8e9a1a9880b0c137cc4755b36a45d337dcae08ebcdcc22d1baea37357723d8babdc80  config-postmarketos-qcom-msm8916.armv7
 "
diff --git a/device/testing/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.aarch64 b/device/testing/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.aarch64
index bf432bd30..2a3501fa8 100644
--- a/device/testing/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.aarch64
+++ b/device/testing/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.aarch64
@@ -1708,7 +1708,8 @@ CONFIG_BLK_DEV_NBD=m
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_VIRTIO_BLK is not set
 # CONFIG_BLK_DEV_RBD is not set
-# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLK_DEV_UBLK=m
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
 
 #
 # NVME Support
diff --git a/device/testing/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.armv7 b/device/testing/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.armv7
index 814bbf856..700f0f3e9 100644
--- a/device/testing/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.armv7
+++ b/device/testing/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.armv7
@@ -1595,7 +1595,8 @@ CONFIG_BLK_DEV_NBD=m
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_VIRTIO_BLK is not set
 # CONFIG_BLK_DEV_RBD is not set
-# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLK_DEV_UBLK=m
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
 
 #
 # NVME Support