diff --git a/firmware/nss-firmware/Makefile b/firmware/nss-firmware/Makefile
index d7e3d57..89c7f15 100644
--- a/firmware/nss-firmware/Makefile
+++ b/firmware/nss-firmware/Makefile
@@ -57,8 +57,8 @@ endef
 
 define Package/nss-firmware-ipq5018
 $(Package/nss-firmware-default)
-	IPQ_PLATFORM=IPQ5018
-	DEPENDS+= @TARGET_qualcommax_ipq50xx +nss-firmware-default
+	IPQ_PLATFORM=IPQ5018 
+	DEPENDS+= @(TARGET_qualcommax_ipq50xx||TARGET_qualcommax_ipq50xx_32) +nss-firmware-default
 	NSS_SOC:=MP
 endef
 
diff --git a/qca-nss-drv/Makefile b/qca-nss-drv/Makefile
index e1fdbcc..c5aad14 100644
--- a/qca-nss-drv/Makefile
+++ b/qca-nss-drv/Makefile
@@ -79,7 +79,7 @@ define KernelPackage/qca-nss-drv
   SECTION:=kernel
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
-  DEPENDS:=@(TARGET_ipq806x||TARGET_qualcommax||TARGET_ipq807x||TARGET_ipq60xx) \
+  DEPENDS:=@(TARGET_ipq806x||TARGET_qualcommax||TARGET_ipq807x||TARGET_ipq60xx||TARGET_ipq50xx||TARGET_ipq50xx_32) \
   				 +!TARGET_ipq806x:kmod-qca-nss-dp \
   				 +TARGET_qualcommax_ipq807x:nss-firmware-ipq8074
   TITLE:=Kernel driver for NSS (core driver)
@@ -120,12 +120,18 @@ ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq807x")
 else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq60xx")
   SOC="ipq60xx_64"
   subtarget:=$(CONFIG_TARGET_SUBTARGET)
+else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq50xx")
+  SOC="ipq50xx_64"
+  subtarget:=$(CONFIG_TARGET_SUBTARGET)
+else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq50xx_32")
+  SOC="ipq50xx_32"
+  subtarget:=$(CONFIG_TARGET_SUBTARGET)
 endif
 
 define Build/InstallDev
 	mkdir -p $(1)/usr/include/qca-nss-drv
 	$(CP) $(PKG_BUILD_DIR)/exports/* $(1)/usr/include/qca-nss-drv/
-ifneq (, $(findstring $(subtarget), "ipq807x" "ipq807x_64" "ipq60xx" "ipq60xx_64" "ipq50xx" "ipq50xx_64"))
+ifneq (, $(findstring $(subtarget), "ipq807x" "ipq807x_64" "ipq60xx" "ipq60xx_64" "ipq50xx" "ipq50xx_64" "ipq50xx_32"))
 	$(RM) $(1)/usr/include/qca-nss-drv/nss_ipsecmgr.h
 endif
 endef