diff --git a/Kbuild b/Kbuild
index b81b5bf..2d98488 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2537,9 +2537,20 @@
 ccflags-y += -DCFG_TGT_NUM_TDLS_CONN_TABLE_ENTRIES=$(CONFIG_CFG_NUM_OF_TDLS_CONN_TABLE_ENTRIES)
 endif
 
-ifdef CONFIG_SIR_MAX_SUPPORTED_BSS
-ccflags-y += -DSIR_MAX_SUPPORTED_BSS=$(CONFIG_SIR_MAX_SUPPORTED_BSS)
-endif
+CONFIG_WLAN_MAX_PSOCS ?= 1
+ccflags-y += -DWLAN_MAX_PSOCS=$(CONFIG_WLAN_MAX_PSOCS)
+
+CONFIG_WLAN_MAX_PDEVS ?= 1
+ccflags-y += -DWLAN_MAX_PDEVS=$(CONFIG_WLAN_MAX_PDEVS)
+
+CONFIG_WLAN_MAX_VDEVS ?= 5
+ccflags-y += -DWLAN_MAX_VDEVS=$(CONFIG_WLAN_MAX_VDEVS)
+
+CONFIG_WLAN_PDEV_MAX_VDEVS ?= $(CONFIG_WLAN_MAX_VDEVS)
+ccflags-y += -DWLAN_PDEV_MAX_VDEVS=$(CONFIG_WLAN_PDEV_MAX_VDEVS)
+
+CONFIG_WLAN_PSOC_MAX_VDEVS ?= $(CONFIG_WLAN_MAX_VDEVS)
+ccflags-y += -DWLAN_PSOC_MAX_VDEVS=$(CONFIG_WLAN_PSOC_MAX_VDEVS)
 
 ifdef CONFIG_SIR_SAP_MAX_NUM_PEERS
 ccflags-y += -DSIR_SAP_MAX_NUM_PEERS=$(CONFIG_SIR_SAP_MAX_NUM_PEERS)
diff --git a/configs/genoa.common b/configs/genoa.common
index 66c2442..b98937c 100644
--- a/configs/genoa.common
+++ b/configs/genoa.common
@@ -189,9 +189,8 @@
 # Number of TDLS peers that each Tdls vdev can track
 CONFIG_CFG_NUM_OF_TDLS_CONN_TABLE_ENTRIES := 4
 
-#Number of BSS sessions at a time, used for allocating memory should never be
-#less then number of vdevs - INI
-CONFIG_SIR_MAX_SUPPORTED_BSS := 3
+# Number of vdevs supported at one time, used for allocating memory
+CONFIG_WLAN_MAX_VDEVS := 3
 
 #Number of STA sessions max connected to our SAP, used for allocating memory
 #should never be less then number of max peers - INI
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 6f3318b..b910203 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -48,9 +48,7 @@
 #include "wlan_policy_mgr_api.h"
 #include "wlan_tdls_public_structs.h"
 
-#ifndef SIR_MAX_SUPPORTED_BSS
-#define SIR_MAX_SUPPORTED_BSS 5
-#endif
+#define SIR_MAX_SUPPORTED_BSS WLAN_MAX_VDEVS
 
 #define OFFSET_OF(structType, fldName)   (&((structType *)0)->fldName)