diff --git a/target/linux/qualcommax/Makefile b/target/linux/qualcommax/Makefile
index 87f919085..e35f55a46 100644
--- a/target/linux/qualcommax/Makefile
+++ b/target/linux/qualcommax/Makefile
@@ -14,8 +14,10 @@ include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += \
 	kmod-usb3 kmod-usb-dwc3 kmod-usb-dwc3-qcom \
 	kmod-leds-gpio kmod-gpio-button-hotplug \
-	kmod-qca-nss-dp kmod-ath11k-ahb \
-	wpad-openssl uboot-envtools \
-	e2fsprogs kmod-fs-ext4 losetup
+	kmod-qca-nss-dp kmod-qca-nss-drv kmod-qca-ssdk \
+	kmod-qca-nss-ecm kmod-qca-nss-drv-bridge-mgr \
+	kmod-qca-nss-drv-vlan kmod-qca-nss-drv-pppoe \
+	kmod-ath11k-ahb wpad-openssl uboot-envtools \
+	e2fsprogs kmod-fs-ext4 losetup autocore-arm
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-360v6.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-360v6.dts
index d83ea6262..e8872c86f 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-360v6.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-360v6.dts
@@ -5,6 +5,7 @@
 #include "ipq6018-512m.dtsi"
 #include "ipq6018-ess.dtsi"
 #include "ipq6018-mp5496.dtsi"
+#include "ipq6018-nss.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-ax18.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-ax18.dts
index 5b28e6981..e887ff87a 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-ax18.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-ax18.dts
@@ -4,6 +4,7 @@
 
 #include "ipq6018-256m.dtsi"
 #include "ipq6018-ess.dtsi"
+#include "ipq6018-nss.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-glinet.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-glinet.dtsi
index 9e3b6b04c..6c2a8e7f5 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-glinet.dtsi
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-glinet.dtsi
@@ -2,6 +2,7 @@
 
 #include "ipq6018-512m.dtsi"
 #include "ipq6018-ess.dtsi"
+#include "ipq6018-nss.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts
index c9a641efa..284f9356a 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts
@@ -5,6 +5,7 @@
 #include "ipq6018-512m.dtsi"
 #include "ipq6018-ess.dtsi"
 #include "ipq6018-mp5496.dtsi"
+#include "ipq6018-nss.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-xiaomi.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-xiaomi.dtsi
index ab16fb375..884f19858 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-xiaomi.dtsi
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-xiaomi.dtsi
@@ -5,6 +5,7 @@
 #include "ipq6018-512m.dtsi"
 #include "ipq6018-ess.dtsi"
 #include "ipq6018-mp5496.dtsi"
+#include "ipq6018-nss.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-nss.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-nss.dtsi
index ef6f42f03..2d04ac140 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-nss.dtsi
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-nss.dtsi
@@ -19,7 +19,6 @@
 		memory-region = <&nss_region>;
 	};
 
-
 	nss0: nss@40000000 {
 		compatible = "qcom,nss";
 		interrupts = <0 402 0x1>, <0 401 0x1>, <0 400 0x1>,
@@ -102,7 +101,6 @@
 		npu-supply = <&nss_dummy_reg>;
 	};
 
-
 	nss_crypto: qcom,nss_crypto {
 		compatible = "qcom,nss-crypto";
 		#address-cells = <1>;
@@ -191,4 +189,4 @@
 			};
 		};
 	};
-};
\ No newline at end of file
+};
diff --git a/target/linux/qualcommax/ipq60xx/target.mk b/target/linux/qualcommax/ipq60xx/target.mk
index 06a85ab5e..7f20467f8 100644
--- a/target/linux/qualcommax/ipq60xx/target.mk
+++ b/target/linux/qualcommax/ipq60xx/target.mk
@@ -1,6 +1,6 @@
 SUBTARGET:=ipq60xx
 BOARDNAME:=Qualcomm Atheros IPQ60xx
-DEFAULT_PACKAGES += ath11k-firmware-ipq6018
+DEFAULT_PACKAGES += ath11k-firmware-ipq6018 nss-firmware-ipq6018
 
 define Target/Description
 	Build firmware images for Qualcomm Atheros IPQ60xx based boards.
diff --git a/target/linux/qualcommax/ipq807x/target.mk b/target/linux/qualcommax/ipq807x/target.mk
index d5aff23ef..a2111ce59 100644
--- a/target/linux/qualcommax/ipq807x/target.mk
+++ b/target/linux/qualcommax/ipq807x/target.mk
@@ -1,6 +1,6 @@
 SUBTARGET:=ipq807x
 BOARDNAME:=Qualcomm Atheros IPQ807x
-DEFAULT_PACKAGES += ath11k-firmware-ipq8074
+DEFAULT_PACKAGES += ath11k-firmware-ipq8074 nss-firmware-ipq8074
 
 define Target/Description
 	Build firmware images for Qualcomm Atheros IPQ807x based boards.