diff --git a/wlan_platform_modules.bzl b/wlan_platform_modules.bzl
index c92cefbf67..d5d59f2dd2 100644
--- a/wlan_platform_modules.bzl
+++ b/wlan_platform_modules.bzl
@@ -2,26 +2,32 @@ load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir")
 load("//build/kernel/kleaf:kernel.bzl", "ddk_module")
 load("//msm-kernel:target_variants.bzl", "get_all_variants")
 
-_module_enablement_map = {
-    # "ALL" will enable for all target/variant combos
-    "cnss2": ["ALL"],
-    # Empty list disables the module build
-    "icnss2": [],
-    "cnss_nl": ["ALL"],
-    "cnss_prealloc": ["ALL"],
-    "cnss_utils": ["ALL"],
-    "wlan_firmware_service": ["ALL"],
-    "cnss_plat_ipc_qmi_svc": ["ALL"],
-}
+_default_module_enablement_list = [
+    "cnss_nl",
+    "cnss_prealloc",
+    "cnss_utils",
+    "wlan_firmware_service"
+]
+
+_cnss2_enabled_target = ["pineapple"]
+_icnss2_enabled_target = ["blair"]
 
 def _get_module_list(target, variant):
     tv = "{}_{}".format(target, variant)
 
     ret = []
-    for (mod, enabled_platforms) in _module_enablement_map.items():
-        if "ALL" in enabled_platforms or tv in enabled_platforms:
-            ret.append(mod)
-            continue
+    is_wlan_platform_enabled = False
+
+    if target in _cnss2_enabled_target:
+        ret.extend(["cnss2", "cnss_plat_ipc_qmi_svc"])
+        is_wlan_platform_enabled = True
+
+    if target in _icnss2_enabled_target:
+        ret.extend(["icnss2"])
+        is_wlan_platform_enabled = True
+
+    if is_wlan_platform_enabled:
+        ret.extend(_default_module_enablement_list)
 
     return [":{}_{}".format(tv, mod) for mod in ret]
 
@@ -29,79 +35,92 @@ def _get_module_list(target, variant):
 def _define_modules_for_target_variant(target, variant):
     tv = "{}_{}".format(target, variant)
 
-    ddk_module(
-        name = "{}_cnss2".format(tv),
-        srcs = native.glob([
-            "cnss2/main.c",
-            "cnss2/bus.c",
-            "cnss2/debug.c",
-            "cnss2/pci.c",
-            "cnss2/pci_platform.h",
-            "cnss2/power.c",
-            "cnss2/genl.c",
-            "cnss2/*.h",
-            "cnss_utils/*.h",
-        ]),
-        includes = ["cnss", "cnss_utils"],
-        kconfig = "cnss2/Kconfig",
-        defconfig = "cnss2/{}_defconfig".format(tv),
-        conditional_srcs =  {
-            "CONFIG_CNSS2_QMI": {
-                True: [
-                    "cnss2/qmi.c",
-                    "cnss2/coexistence_service_v01.c",
-                    "cnss2/ip_multimedia_subsystem_private_service_v01.c",
-                ]
-            },
-            "CONFIG_PCI_MSM": {
-                True: [
-                    "cnss2/pci_qcom.c",
-                ],
-            },
-        },
-        out = "cnss2.ko",
-        kernel_build = "//msm-kernel:{}".format(tv),
-        deps = [
-            "//vendor/qcom/opensource/securemsm-kernel:{}_smcinvoke_dlkm".format(tv),
-            ":{}_cnss_utils".format(tv),
-            ":{}_cnss_prealloc".format(tv),
-            ":{}_wlan_firmware_service".format(tv),
-            ":{}_cnss_plat_ipc_qmi_svc".format(tv),
-            "//msm-kernel:all_headers",
-            ":wlan-platform-headers",
-        ],
-    )
+    cnss2_enabled = 0
+    plat_ipc_qmi_svc_enabled = 0
+    icnss2_enabled = 0
 
-    ddk_module(
-        name = "{}_icnss2".format(tv),
-        srcs = native.glob([
-            "icnss2/main.c",
-            "icnss2/debug.c",
-            "icnss2/power.c",
-            "icnss2/genl.c",
-            "icnss2/*.h",
-            "cnss_utils/*.h",
-        ]),
-        includes = ["icnss2", "cnss_utils"],
-        kconfig = "icnss2/Kconfig",
-        defconfig = "icnss2/{}_defconfig".format(tv),
-        conditional_srcs = {
-            "CONFIG_ICNSS2_QMI": {
-                True: [
-                    "icnss2/qmi.c",
-                ],
+    if target in _cnss2_enabled_target:
+        cnss2_enabled = 1
+        plat_ipc_qmi_svc_enabled = 1
+
+    if target in _icnss2_enabled_target:
+        icnss2_enabled = 1
+
+    if cnss2_enabled:
+        ddk_module(
+            name = "{}_cnss2".format(tv),
+            srcs = native.glob([
+                "cnss2/main.c",
+                "cnss2/bus.c",
+                "cnss2/debug.c",
+                "cnss2/pci.c",
+                "cnss2/pci_platform.h",
+                "cnss2/power.c",
+                "cnss2/genl.c",
+                "cnss2/*.h",
+                "cnss_utils/*.h",
+            ]),
+            includes = ["cnss", "cnss_utils"],
+            kconfig = "cnss2/Kconfig",
+            defconfig = "cnss2/{}_defconfig".format(tv),
+            conditional_srcs =  {
+                "CONFIG_CNSS2_QMI": {
+                    True: [
+                        "cnss2/qmi.c",
+                        "cnss2/coexistence_service_v01.c",
+                        "cnss2/ip_multimedia_subsystem_private_service_v01.c",
+                    ]
+                },
+                "CONFIG_PCI_MSM": {
+                    True: [
+                        "cnss2/pci_qcom.c",
+                    ],
+                },
             },
-        },
-        out = "icnss2.ko",
-        kernel_build = "//msm-kernel:{}".format(tv),
-        deps = [
-            ":{}_cnss_utils".format(tv),
-            ":{}_cnss_prealloc".format(tv),
-            ":{}_wlan_firmware_service".format(tv),
-            "//msm-kernel:all_headers",
-            ":wlan-platform-headers",
-        ],
-    )
+            out = "cnss2.ko",
+            kernel_build = "//msm-kernel:{}".format(tv),
+            deps = [
+                "//vendor/qcom/opensource/securemsm-kernel:{}_smcinvoke_dlkm".format(tv),
+                ":{}_cnss_utils".format(tv),
+                ":{}_cnss_prealloc".format(tv),
+                ":{}_wlan_firmware_service".format(tv),
+                ":{}_cnss_plat_ipc_qmi_svc".format(tv),
+                "//msm-kernel:all_headers",
+                ":wlan-platform-headers",
+            ],
+        )
+
+    if icnss2_enabled:
+        ddk_module(
+            name = "{}_icnss2".format(tv),
+            srcs = native.glob([
+                "icnss2/main.c",
+                "icnss2/debug.c",
+                "icnss2/power.c",
+                "icnss2/genl.c",
+                "icnss2/*.h",
+                "cnss_utils/*.h",
+            ]),
+            includes = ["icnss2", "cnss_utils"],
+            kconfig = "icnss2/Kconfig",
+            defconfig = "icnss2/{}_defconfig".format(tv),
+            conditional_srcs = {
+                "CONFIG_ICNSS2_QMI": {
+                    True: [
+                        "icnss2/qmi.c",
+                    ],
+                },
+            },
+            out = "icnss2.ko",
+            kernel_build = "//msm-kernel:{}".format(tv),
+            deps = [
+                ":{}_cnss_utils".format(tv),
+                ":{}_cnss_prealloc".format(tv),
+                ":{}_wlan_firmware_service".format(tv),
+                "//msm-kernel:all_headers",
+                ":wlan-platform-headers",
+            ],
+        )
 
     ddk_module(
         name = "{}_cnss_nl".format(tv),
@@ -165,19 +184,20 @@ def _define_modules_for_target_variant(target, variant):
         deps = ["//msm-kernel:all_headers"],
     )
 
-    ddk_module(
-        name = "{}_cnss_plat_ipc_qmi_svc".format(tv),
-        srcs = native.glob([
-            "cnss_utils/cnss_plat_ipc_qmi.c",
-            "cnss_utils/cnss_plat_ipc_service_v01.c",
-            "cnss_utils/*.h"
-        ]),
-        kconfig = "cnss_utils/Kconfig",
-        defconfig = "cnss_utils/{}_defconfig".format(tv),
-        out = "cnss_plat_ipc_qmi_svc.ko",
-        kernel_build = "//msm-kernel:{}".format(tv),
-        deps = ["//msm-kernel:all_headers"],
-    )
+    if plat_ipc_qmi_svc_enabled:
+        ddk_module(
+            name = "{}_cnss_plat_ipc_qmi_svc".format(tv),
+            srcs = native.glob([
+                "cnss_utils/cnss_plat_ipc_qmi.c",
+                "cnss_utils/cnss_plat_ipc_service_v01.c",
+                "cnss_utils/*.h"
+            ]),
+            kconfig = "cnss_utils/Kconfig",
+            defconfig = "cnss_utils/{}_defconfig".format(tv),
+            out = "cnss_plat_ipc_qmi_svc.ko",
+            kernel_build = "//msm-kernel:{}".format(tv),
+            deps = ["//msm-kernel:all_headers"],
+        )
 
     copy_to_dist_dir(
         name = "{}_modules_dist".format(tv),