diff --git a/device/community/firmware-bq-picmt/APKBUILD b/device/community/firmware-bq-picmt/APKBUILD
index 9d4dac1c1..964aee931 100644
--- a/device/community/firmware-bq-picmt/APKBUILD
+++ b/device/community/firmware-bq-picmt/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=firmware-bq-picmt
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 _commit="04cced17ab21d84ea6145e58f0b12fd67ef640d0"
 pkgdesc="Firmware for BQ Aquaris X5"
 url="https://github.com/JonnyMe/picmt-firmware"
@@ -27,7 +27,8 @@ package() {
 
 modem() {
 	pkgdesc="BQ Aquaris X5 modem firmware"
-	install -Dm644 "$srcdir"/modem.mbn "$subpkgdir/$_fwdir"/modem.mdt
+	install -Dm644 "$srcdir"/modem.mbn "$subpkgdir/$_fwdir"/modem.mbn
+	ln -s modem.mbn "$subpkgdir/$_fwdir"/modem.mdt
 	install -Dm644 "$srcdir"/mba.mbn "$subpkgdir/$_fwdir"/mba.mbn
 }
 
@@ -37,14 +38,17 @@ venus() {
 
 	# Linux detects squashed (.mbn) vs non-squashed (.mdt + .b*) based on
 	# file contents, so it is fine to install venus.mbn to venus.mdt
-	install -Dm644 "$srcdir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
+	# Older kernels look for venus.mdt, newer ones directly for venus.mbn
+	install -Dm644 "$srcdir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mbn
+	ln -s venus.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
 }
 
 wcnss() {
 	pkgdesc="BQ Aquaris X5 WiFi/BT firmware"
 	provides="firmware-qcom-msm8916-wcnss=$pkgver-r$pkgrel"
 
-	install -Dm644 "$srcdir"/wcnss.mbn "$subpkgdir/$_fwdir"/wcnss.mdt
+	install -Dm644 "$srcdir"/wcnss.mbn "$subpkgdir/$_fwdir"/wcnss.mbn
+	ln -s wcnss.mbn "$subpkgdir/$_fwdir"/wcnss.mdt
 }
 
 wcnss_nv() {
diff --git a/device/community/firmware-motorola-harpia/APKBUILD b/device/community/firmware-motorola-harpia/APKBUILD
index 1868052ba..c0cb3ce78 100644
--- a/device/community/firmware-motorola-harpia/APKBUILD
+++ b/device/community/firmware-motorola-harpia/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=firmware-motorola-harpia
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 pkgdesc="Firmware for Motorola Moto G4 Play"
 url="https://github.com/Sorixelle/vendor_motorola_harpia"
 subpackages="$pkgname-wcnss-nv:wcnss_nv $pkgname-venus"
@@ -34,8 +34,10 @@ venus() {
 	pkgdesc="Motorola Moto G4 Play video firmware"
 
 	# Linux detects squashed (.mbn) vs non-squashed (.mdt + .b*) based on
-	# file contents, so it is fine to install venus.mbn to venus.mdt
-	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
+	# file contents, so it is fine to link venus.mbn to venus.mdt
+	# Older kernels look for venus.mdt, newer ones directly for venus.mbn
+	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mbn
+	ln -s venus.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
 }
 
 sha512sums="56a7f815bea3d20a5ef0241ae109ac3823c6ac433e2a05389035b7005c7966d7a0a7719dbf5a562c6cf53c18cebd6893d31d27a6efc1a50c307565f873b1aa54  firmware-motorola-harpia-a81be710b0ff4ee7e5fd1962184dcd882cc13efc.tar.gz"
diff --git a/device/community/firmware-motorola-osprey/APKBUILD b/device/community/firmware-motorola-osprey/APKBUILD
index c3cb2b9fc..69b5edc33 100644
--- a/device/community/firmware-motorola-osprey/APKBUILD
+++ b/device/community/firmware-motorola-osprey/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=firmware-motorola-osprey
-pkgver=3
+pkgver=4
 pkgrel=0
 pkgdesc="Firmware for Motorola Moto G 2015"
 url="https://github.com/pmsourcedump/firmware-motorola-osprey"
@@ -32,8 +32,9 @@ wcnss() {
 	pkgdesc="Motorola Moto G 2015 WiFi/BT firmware"
 
 	# Linux detects squashed (.mbn) vs non-squashed (.mdt + .b*) based on
-	# file contents, so it is fine to install wcnss.mbn to wcnss.mdt
-	install -Dm644 "$builddir"/wcnss.mbn "$subpkgdir/$_fwdir"/wcnss.mdt
+	# file contents, so it is fine to link wcnss.mbn to wcnss.mdt
+	install -Dm644 "$builddir"/wcnss.mbn "$subpkgdir/$_fwdir"/wcnss.mbn
+	ln -s wcnss.mbn "$subpkgdir/$_fwdir"/wcnss.mdt
 }
 
 wcnss_nv() {
@@ -45,8 +46,10 @@ venus() {
 	pkgdesc="Motorola Moto G 2015 video firmware"
 
 	# Linux detects squashed (.mbn) vs non-squashed (.mdt + .b*) based on
-	# file contents, so it is fine to install venus.mbn to venus.mdt
-	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
+	# file contents, so it is fine to link venus.mbn to venus.mdt
+	# Older kernels look for venus.mdt, newer ones directly for venus.mbn
+	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mbn
+	ln -s venus.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
 }
 
 sha512sums="
diff --git a/device/community/firmware-qcom-db410c-wcnss/APKBUILD b/device/community/firmware-qcom-db410c-wcnss/APKBUILD
index f250a0fb1..2e3edd24b 100644
--- a/device/community/firmware-qcom-db410c-wcnss/APKBUILD
+++ b/device/community/firmware-qcom-db410c-wcnss/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=firmware-qcom-db410c-wcnss
 pkgver=1034.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="DragonBoard 410c WiFi/BT firmware"
 url="https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware/"
 subpackages="$pkgname-doc"
@@ -40,6 +40,7 @@ package() {
 
 	# Still link to old location in case this is installed on other devices
 	mkdir -p "$pkgdir"/lib/firmware/postmarketos
+	ln -s "$_fwdir"/apq8016/wcnss.mbn "$pkgdir"/lib/firmware/postmarketos/wcnss.mbn
 	ln -s "$_fwdir"/apq8016/wcnss.mbn "$pkgdir"/lib/firmware/postmarketos/wcnss.mdt
 }
 
diff --git a/device/community/firmware-qcom-db410c/APKBUILD b/device/community/firmware-qcom-db410c/APKBUILD
index 707ca338e..274e1f8da 100644
--- a/device/community/firmware-qcom-db410c/APKBUILD
+++ b/device/community/firmware-qcom-db410c/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=firmware-qcom-db410c
 pkgver=1036.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for DragonBoard 410c"
 url="https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware/"
 subpackages="
@@ -62,8 +62,10 @@ venus() {
 	provider_priority=100
 
 	# Linux detects squashed (.mbn) vs non-squashed (.mdt + .b*) based on
-	# file contents, so it is fine to install venus.mbn to venus.mdt
-	install -Dm644 "$builddir"/venus.mbn "$subpkgdir/$_fwdir"/venus-1.8/venus.mdt
+	# file contents, so it is fine to link venus.mbn to venus.mdt
+	# Older kernels look for venus.mdt, newer ones directly for venus.mbn
+	install -Dm644 "$builddir"/venus.mbn "$subpkgdir/$_fwdir"/venus-1.8/venus.mbn
+	ln -s venus.mbn "$subpkgdir/$_fwdir"/venus-1.8/venus.mdt
 }
 
 sha512sums="
diff --git a/device/community/firmware-wileyfox-crackling/APKBUILD b/device/community/firmware-wileyfox-crackling/APKBUILD
index 5f672a3c0..aaa41f6e1 100644
--- a/device/community/firmware-wileyfox-crackling/APKBUILD
+++ b/device/community/firmware-wileyfox-crackling/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=firmware-wileyfox-crackling
-pkgver=4
+pkgver=5
 pkgrel=0
 pkgdesc="Firmware for Wileyfox Swift"
 url="https://rizzotherat.gitlab.io/firmware/"
@@ -26,8 +26,10 @@ venus() {
 	pkgdesc="Wileyfox Swift video firmware"
 
 	# Linux detects squashed (.mbn) vs non-squashed (.mdt + .b*) based on
-	# file contents, so it is fine to install venus.mbn to venus.mdt
-	install -Dm644 "$srcdir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
+	# file contents, so it is fine to link venus.mbn to venus.mdt
+	# Older kernels look for venus.mdt, newer ones directly for venus.mbn
+	install -Dm644 "$srcdir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mbn
+	ln -s venus.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
 }
 
 wcnss_nv() {
diff --git a/device/testing/firmware-alcatel-idol3/APKBUILD b/device/testing/firmware-alcatel-idol3/APKBUILD
index fb4c0cfe6..0908dd284 100644
--- a/device/testing/firmware-alcatel-idol3/APKBUILD
+++ b/device/testing/firmware-alcatel-idol3/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=firmware-alcatel-idol3
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Firmware for Alcatel OneTouch Idol 3 (5.5)"
 url="https://github.com/vknecht/"
@@ -29,8 +29,10 @@ venus() {
 	pkgdesc="Alcatel OneTouch Idol 3 (5.5) video firmware"
 
 	# Linux detects squashed (.mbn) vs non-squashed (.mdt + .b*) based on
-	# file contents, so it is fine to install venus.mbn to venus.mdt
-	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
+	# file contents, so it is fine to link venus.mbn to venus.mdt
+	# Older kernels look for venus.mdt, newer ones directly for venus.mbn
+	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mbn
+	ln -s venus.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
 }
 
 wcnss_nv() {
diff --git a/device/testing/firmware-alcatel-idol347/APKBUILD b/device/testing/firmware-alcatel-idol347/APKBUILD
index 73bd052f1..c9c4c5697 100644
--- a/device/testing/firmware-alcatel-idol347/APKBUILD
+++ b/device/testing/firmware-alcatel-idol347/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=firmware-alcatel-idol347
-pkgver=3
+pkgver=4
 pkgrel=0
 pkgdesc="Firmware for Alcatel OneTouch Idol 3 (4.7)"
 url="https://github.com/vknecht/"
@@ -29,8 +29,10 @@ venus() {
 	pkgdesc="Alcatel OneTouch Idol 3 (4.7) video firmware"
 
 	# Linux detects squashed (.mbn) vs non-squashed (.mdt + .b*) based on
-	# file contents, so it is fine to install venus.mbn to venus.mdt
-	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
+	# file contents, so it is fine to link venus.mbn to venus.mdt
+	# Older kernels look for venus.mdt, newer ones directly for venus.mbn
+	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mbn
+	ln -s venus.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
 }
 
 wcnss_nv() {
diff --git a/device/testing/firmware-asus-z010d/APKBUILD b/device/testing/firmware-asus-z010d/APKBUILD
index 3adbf56aa..2d3862c7e 100644
--- a/device/testing/firmware-asus-z010d/APKBUILD
+++ b/device/testing/firmware-asus-z010d/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=firmware-asus-z010d
-pkgver=3
+pkgver=4
 pkgrel=0
 pkgdesc="Firmware for Asus Zenfone Max ZC550KL"
 url="https://gitlab.com/camillathechicken/firmware-max"
@@ -36,8 +36,10 @@ venus() {
 	pkgdesc="Asus Zenfone Max ZC550KL video firmware"
 
 	# Linux detects squashed (.mbn) vs non-squashed (.mdt + .b*) based on
-	# file contents, so it is fine to install venus.mbn to venus.mdt
-	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
+	# file contents, so it is fine to link venus.mbn to venus.mdt
+	# Older kernels look for venus.mdt, newer ones directly for venus.mbn
+	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mbn
+	ln -s venus.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
 }
 
 sha512sums="870c4835de86aac68f29249d6f1545dc8b9ccdb4c3a19ed19eb3429c5d0ab40ed3ffceba36bf54b69a9e3ca2170fde66b2e357a8686580865bfa38e8b99e0cd6  firmware-asus-z010d-v0.1.tar.gz"
diff --git a/device/testing/firmware-bq-piccolo/APKBUILD b/device/testing/firmware-bq-piccolo/APKBUILD
index 06ead6ef8..fb703bbaa 100644
--- a/device/testing/firmware-bq-piccolo/APKBUILD
+++ b/device/testing/firmware-bq-piccolo/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=firmware-bq-piccolo
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 pkgdesc="Firmware for BQ Aquaris M5"
 url="https://gitlab.com/a_a/"
 subpackages="$pkgname-venus $pkgname-wcnss-nv:wcnss_nv"
@@ -29,8 +29,10 @@ venus() {
 	pkgdesc="BQ Aquaris M5 video firmware"
 
 	# Linux detects squashed (.mbn) vs non-squashed (.mdt + .b*) based on
-	# file contents, so it is fine to install venus.mbn to venus.mdt
-	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
+	# file contents, so it is fine to link venus.mbn to venus.mdt
+	# Older kernels look for venus.mdt, newer ones directly for venus.mbn
+	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mbn
+	ln -s venus.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
 }
 
 wcnss_nv() {
diff --git a/device/testing/firmware-huawei-kiwi/APKBUILD b/device/testing/firmware-huawei-kiwi/APKBUILD
index 6e1fa0099..e316a0ad1 100644
--- a/device/testing/firmware-huawei-kiwi/APKBUILD
+++ b/device/testing/firmware-huawei-kiwi/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=firmware-huawei-kiwi
-pkgver=1
-pkgrel=2
+pkgver=2
+pkgrel=0
 _name="Huawei Honor 5X / GR5 (2016)"
 pkgdesc="Firmware for $_name"
 url="https://git.sr.ht/~bo41/firmware-huawei-kiwi"
@@ -29,8 +29,10 @@ venus() {
 	pkgdesc="$_name video firmware"
 
 	# Linux detects squashed (.mbn) vs non-squashed (.mdt + .b*) based on
-	# file contents, so it is fine to install venus.mbn to venus.mdt
-	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
+	# file contents, so it is fine to link venus.mbn to venus.mdt
+	# Older kernels look for venus.mdt, newer ones directly for venus.mbn
+	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mbn
+	ln -s venus.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
 }
 
 wcnss_nv() {
diff --git a/device/testing/firmware-lenovo-a6020/APKBUILD b/device/testing/firmware-lenovo-a6020/APKBUILD
index 540a25ba2..33cd616bb 100644
--- a/device/testing/firmware-lenovo-a6020/APKBUILD
+++ b/device/testing/firmware-lenovo-a6020/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=firmware-lenovo-a6020
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Firmware for Lenovo Vibe K5"
 url="https://github.com/ArrowOS-Devices/android_vendor_lenovo_A6020"
@@ -30,8 +30,10 @@ venus() {
 	pkgdesc="Lenovo Vibe K5 video firmware"
 
 	# Linux detects squashed (.mbn) vs non-squashed (.mdt + .b*) based on
-	# file contents, so it is fine to install venus.mbn to venus.mdt
-	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
+	# file contents, so it is fine to link venus.mbn to venus.mdt
+	# Older kernels look for venus.mdt, newer ones directly for venus.mbn
+	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mbn
+	ln -s venus.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
 }
 
 wcnss_nv() {
diff --git a/device/testing/firmware-motorola-surnia/APKBUILD b/device/testing/firmware-motorola-surnia/APKBUILD
index 100da0d80..e7e0b63cb 100644
--- a/device/testing/firmware-motorola-surnia/APKBUILD
+++ b/device/testing/firmware-motorola-surnia/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Craig Comstock <craig@unreasonablefarm.org>
 pkgname=firmware-motorola-surnia
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Firmware for Motorola Moto E 2015 (2nd gen)"
 url="https://github.com/linuxgorl/vendor_motorola_surnia"
@@ -30,8 +30,10 @@ venus() {
 	pkgdesc="Motorola Moto E 2015 (2nd gen) video firmware"
 
 	# Linux detects squashed (.mbn) vs non-squashed (.mdt + .b*) based on
-	# file contents, so it is fine to install venus.mbn to venus.mdt
-	install -Dm644 "$builddir"/venus.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
+	# file contents, so it is fine to link venus.mbn to venus.mdt
+	# Older kernels look for venus.mdt, newer ones directly for venus.mbn
+	install -Dm644 "$builddir"/venus.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mbn
+	ln -s venus.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
 }