diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile
index c77e165eed..21d6efb53f 100644
--- a/target/linux/ipq40xx/image/Makefile
+++ b/target/linux/ipq40xx/image/Makefile
@@ -134,7 +134,7 @@ define Device/alfa-network_ap120c-ac
 	DEVICE_VENDOR := ALFA Network
 	DEVICE_MODEL := AP120C-AC
 	DEVICE_DTS := qcom-ipq4018-ap120c-ac
-	DEVICE_PACKAGES := kmod-usb-acm kmod-tpm-i2c-atmel 
+	DEVICE_PACKAGES := kmod-usb-acm kmod-tpm-i2c-atmel
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	IMAGE_SIZE := 65536k
@@ -198,8 +198,8 @@ define Device/asus_rt-ac58u
 	UIMAGE_NAME:=$(shell echo -e '\03\01\01\01RT-AC58U')
 	KERNEL_INITRAMFS := $$(KERNEL) | uImage none
 	KERNEL_INITRAMFS_SUFFIX := -factory.trx
-	DEVICE_PACKAGES := -kmod-ath10k -ath10k-firmware-qca4019 \
-	kmod-ath10k-ct-smallbuffers ath10k-firmware-qca4019-ct kmod-usb-ledtrig-usbport
+	DEVICE_PACKAGES := -ath10k-firmware-qca4019 ath10k-firmware-qca4019-ct \
+		-kmod-ath10k kmod-ath10k-ct-smallbuffers kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += asus_rt-ac58u
 
@@ -412,7 +412,8 @@ define Device/engenius_eap2200
 	DEVICE_DTS := qcom-ipq4019-eap2200
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
-	DEVICE_PACKAGES := ath10k-firmware-qca9888 ipq-wifi-engenius_eap2200 -kmod-ath10k kmod-ath10k-ct-smallbuffers
+	DEVICE_PACKAGES := -ath10k-firmware-qca4019 ath10k-firmware-qca4019-ct -kmod-ath10k \
+		ath10k-firmware-qca9888 ipq-wifi-engenius_eap2200 kmod-ath10k-ct-smallbuffers
 endef
 TARGET_DEVICES += engenius_eap2200
 
@@ -481,8 +482,8 @@ define Device/ezviz_cs-w3-wd1200g-eup
 	DEVICE_DTS := qcom-ipq4018-cs-w3-wd1200g-eup
 	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \
 		append-metadata
-	DEVICE_PACKAGES := -kmod-ath10k -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers \
-		ipq-wifi-ezviz_cs-w3-wd1200g-eup
+	DEVICE_PACKAGES := -ath10k-firmware-qca4019 ath10k-firmware-qca4019-ct \
+	-kmod-ath10k kmod-ath10k-ct-smallbuffers ipq-wifi-ezviz_cs-w3-wd1200g-eup
 endef
 TARGET_DEVICES += ezviz_cs-w3-wd1200g-eup
 
@@ -798,8 +799,8 @@ define Device/zyxel_wre6606
 	DEVICE_DTS_CONFIG := config@4
 	IMAGE_SIZE := 13184k
 	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
-	DEVICE_PACKAGES := -kmod-ath10k -ath10k-firmware-qca4019 \
-	kmod-ath10k-ct-smallbuffers ath10k-firmware-qca4019-ct
+	DEVICE_PACKAGES := -ath10k-firmware-qca4019 ath10k-firmware-qca4019-ct \
+		-kmod-ath10k kmod-ath10k-ct-smallbuffers
 endef
 TARGET_DEVICES += zyxel_wre6606