diff --git a/qca/qca-nss-drv/Makefile b/qca/qca-nss-drv/Makefile
index 057ba62..92f073a 100644
--- a/qca/qca-nss-drv/Makefile
+++ b/qca/qca-nss-drv/Makefile
@@ -146,8 +146,10 @@ ifndef CONFIG_NSS_DRV_EDMA_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_EDMA_ENABLE=n
 endif
 ifndef CONFIG_NSS_DRV_GRE_ENABLE
+ifndef CONFIG_PACKAGE_kmod-gre
    DRV_MAKE_OPTS += NSS_DRV_GRE_ENABLE=n
 endif
+endif
 ifndef CONFIG_NSS_DRV_GRE_REDIR_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_GRE_REDIR_ENABLE=n
 endif
@@ -158,8 +160,10 @@ ifndef CONFIG_NSS_DRV_IGS_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_IGS_ENABLE=n
 endif
 ifndef CONFIG_NSS_DRV_IPSEC_ENABLE
+ifndef CONFIG_PACKAGE_kmod-ipsec
    DRV_MAKE_OPTS += NSS_DRV_IPSEC_ENABLE=n
 endif
+endif
 ifndef CONFIG_NSS_DRV_IPV4_REASM_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_IPV4_REASM_ENABLE=n
 endif
@@ -170,13 +174,17 @@ ifndef CONFIG_NSS_DRV_IPV6_REASM_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_IPV6_REASM_ENABLE=n
 endif
 ifndef CONFIG_NSS_DRV_L2TP_ENABLE
+ifndef CONFIG_PACKAGE_kmod-l2tp
    DRV_MAKE_OPTS += NSS_DRV_L2TP_ENABLE=n
 endif
+endif
 ifndef CONFIG_NSS_DRV_LAG_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_LAG_ENABLE=n
 endif
 ifndef CONFIG_NSS_DRV_MAPT_ENABLE
-   DRV_MAKE_OPTS += NSS_DRV_MAPT_ENABLE=n
+ifndef CONFIG_PACKAGE_kmod-nat46
+   DRV_MAKE_OPTS += CONFIG_NSS_DRV_MAPT_ENABLE=n
+endif
 endif
 ifndef CONFIG_NSS_DRV_MATCH_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_MATCH_ENABLE=n
@@ -194,11 +202,15 @@ ifndef CONFIG_NSS_DRV_PPE_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_PPE_ENABLE=n
 endif
 ifndef CONFIG_NSS_DRV_PPPOE_ENABLE
+ifndef CONFIG_PACKAGE_kmod-pppoe
    DRV_MAKE_OPTS += NSS_DRV_PPPOE_ENABLE=n
 endif
+endif
 ifndef CONFIG_NSS_DRV_PPTP_ENABLE
+ifndef CONFIG_PACKAGE_kmod-pptp
    DRV_MAKE_OPTS += NSS_DRV_PPTP_ENABLE=n
 endif
+endif
 ifndef CONFIG_NSS_DRV_PVXLAN_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_PVXLAN_ENABLE=n
 endif
@@ -233,8 +245,10 @@ ifndef CONFIG_NSS_DRV_TSTAMP_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_TSTAMP_ENABLE=n
 endif
 ifndef CONFIG_NSS_DRV_TUN6RD_ENABLE
+ifndef CONFIG_PACKAGE_kmod-sit
    DRV_MAKE_OPTS += NSS_DRV_TUN6RD_ENABLE=n
 endif
+endif
 ifndef CONFIG_NSS_DRV_TUNIPIP6_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_TUNIPIP6_ENABLE=n
 endif
diff --git a/qca/qca-nss-ecm/Makefile b/qca/qca-nss-ecm/Makefile
index 006a8c5..9d34d00 100644
--- a/qca/qca-nss-ecm/Makefile
+++ b/qca/qca-nss-ecm/Makefile
@@ -21,10 +21,6 @@ define KernelPackage/qca-nss-ecm
   SUBMENU:=Network Support
   DEPENDS:=@(TARGET_qualcommax||TARGET_ipq60xx) \
 		   +@NSS_DRV_IPV6_ENABLE \
-		   +@NSS_DRV_PPE_ENABLE \
-		   +@NSS_DRV_TUN6RD_ENABLE \
-		   +@NSS_DRV_PPPOE_ENABLE \
-		   +@NSS_DRV_PPTP_ENABLE \
 		   +@NSS_DRV_VIRT_IF_ENABLE \
 		   +@NSS_DRV_WIFI_ENABLE \
 		   +kmod-qca-nss-drv \