diff --git a/device/community/device-wileyfox-crackling/APKBUILD b/device/community/device-wileyfox-crackling/APKBUILD
index 3c1414df1..d2099a0ff 100644
--- a/device/community/device-wileyfox-crackling/APKBUILD
+++ b/device/community/device-wileyfox-crackling/APKBUILD
@@ -3,8 +3,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-wileyfox-crackling
 pkgdesc="Wileyfox Swift"
-pkgver=3
-pkgrel=4
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -16,7 +16,6 @@ subpackages="
 	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-kernel-mainline-modem:kernel_mainline_modem
 	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-nonfree-firmware-modem:nonfree_firmware_modem
 "
 
 build() {
@@ -41,14 +40,7 @@ kernel_mainline_modem() {
 
 nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="linux-firmware-qcom firmware-wileyfox-crackling-venus firmware-wileyfox-crackling-wcnss"
-	mkdir "$subpkgdir"
-}
-
-nonfree_firmware_modem() {
-	pkgdesc="Modem firmware"
-	depends="firmware-wileyfox-crackling-modem"
-	install_if="$pkgname-nonfree-firmware $pkgname-kernel-mainline-modem"
+	depends="linux-firmware-qcom msm-firmware-loader firmware-wileyfox-crackling-wcnss-nv firmware-wileyfox-crackling-venus"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/community/firmware-wileyfox-crackling/APKBUILD b/device/community/firmware-wileyfox-crackling/APKBUILD
index 14d1448f1..75499a5e9 100644
--- a/device/community/firmware-wileyfox-crackling/APKBUILD
+++ b/device/community/firmware-wileyfox-crackling/APKBUILD
@@ -1,9 +1,9 @@
 pkgname=firmware-wileyfox-crackling
-pkgver=2
+pkgver=3
 pkgrel=0
 pkgdesc="Firmware for Wileyfox Swift"
 url="https://rizzotherat.gitlab.io/firmware/"
-subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss"
+subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss $pkgname-wcnss-nv:wcnss_nv"
 arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
@@ -31,6 +31,12 @@ wcnss() {
 	pkgdesc="Wileyfox Swift WiFi/BT firmware"
 	cd "$srcdir"
 	install -Dm644 wcnss.* -t "$subpkgdir/$_fwdir"
+}
+
+wcnss_nv() {
+	pkgdesc="Wileyfox Swift WiFi/BT firmware configuration"
+	replaces="firmware-wileyfox-crackling-wcnss"
+	cd "$srcdir"
 	install -Dm644 WCNSS_* -t "$subpkgdir/$_fwdir"/wlan/prima
 }