diff --git a/device/community/device-motorola-harpia/APKBUILD b/device/community/device-motorola-harpia/APKBUILD
index bf844acfb..105aa821a 100644
--- a/device/community/device-motorola-harpia/APKBUILD
+++ b/device/community/device-motorola-harpia/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-motorola-harpia
 pkgdesc="Motorola Moto G4 Play"
-pkgver=7
-pkgrel=2
+pkgver=8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -31,8 +31,12 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	# harpia's WCNSS firmware has problems with WiFi channels on some device
+	# variants, using osprey's firmware seems to help as a workaround
+	# (see https://gitlab.com/postmarketOS/pmaports/-/issues/1085)
 	depends="firmware-qcom-adreno-a300 msm-firmware-loader
-		 firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus"
+		 firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus
+		 firmware-motorola-osprey-wcnss"
 	mkdir "$subpkgdir"
 }