diff --git a/Kbuild b/Kbuild
index 73bab059a2b9..a32efb811890 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2030,10 +2030,30 @@ ifdef CONFIG_CFG_PMO_WOW_FILTERS_MAX
 ccflags-y += -DPMO_WOW_FILTERS_MAX=$(CONFIG_CFG_PMO_WOW_FILTERS_MAX)
 endif
 
+ifdef CONFIG_CFG_GTK_OFFLOAD_MAX_VDEV
+ccflags-y += -DCFG_TGT_DEFAULT_GTK_OFFLOAD_MAX_VDEV=$(CONFIG_CFG_GTK_OFFLOAD_MAX_VDEV)
+endif
+
+ifdef CONFIG_CFG_ROAM_OFFLOAD_MAX_VDEV
+ccflags-y += -DCFG_TGT_DEFAULT_ROAM_OFFLOAD_MAX_VDEV=$(CONFIG_CFG_ROAM_OFFLOAD_MAX_VDEV)
+endif
+
+ifdef CONFIG_CFG_MAX_PERIODIC_TX_PTRNS
+ccflags-y += -DWMA_MAXNUM_PERIODIC_TX_PTRNS=$(CONFIG_CFG_MAX_PERIODIC_TX_PTRNS)
+endif
+
+ifdef CONFIG_CFG_MAX_STA_VDEVS
+ccflags-y += -DCFG_TGT_DEFAULT_MAX_STA_VDEVS=$(CONFIG_CFG_MAX_STA_VDEVS)
+endif
+
 ifdef CONFIG_CFG_NUM_OF_ADDITIONAL_FW_PEERS
 ccflags-y += -DNUM_OF_ADDITIONAL_FW_PEERS=$(CONFIG_CFG_NUM_OF_ADDITIONAL_FW_PEERS)
 endif
 
+ifdef CONFIG_CFG_NUM_OF_TDLS_CONN_TABLE_ENTRIES
+ccflags-y += -DCFG_TGT_NUM_TDLS_CONN_TABLE_ENTRIES=$(CONFIG_CFG_NUM_OF_TDLS_CONN_TABLE_ENTRIES)
+endif
+
 KBUILD_CPPFLAGS += $(cppflags-y)
 
 # Currently, for versions of gcc which support it, the kernel Makefile
diff --git a/configs/genoa.common b/configs/genoa.common
index 78ef2ab6a518..3fb5401ec597 100644
--- a/configs/genoa.common
+++ b/configs/genoa.common
@@ -138,6 +138,19 @@ endif
 # WoW filer configs
 CONFIG_CFG_PMO_WOW_FILTERS_MAX := 16
 
+# Offload configs
+CONFIG_CFG_GTK_OFFLOAD_MAX_VDEV := 2
+CONFIG_CFG_ROAM_OFFLOAD_MAX_VDEV := 1
+
+# Max Periodic Tx Pattern Config
+CONFIG_CFG_MAX_PERIODIC_TX_PTRNS := 2
+
+# Max Sta Vdev Config
+CONFIG_CFG_MAX_STA_VDEVS := 2
+
 # Additional peers sent to firmware
 CONFIG_CFG_NUM_OF_ADDITIONAL_FW_PEERS := 0
+
+# Number of TDLS peers that each Tdls vdev can track
+CONFIG_CFG_NUM_OF_TDLS_CONN_TABLE_ENTRIES := 4
 ###################################
diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h
index b620a879ad42..5a2c0139c864 100644
--- a/core/wma/inc/wma_internal.h
+++ b/core/wma/inc/wma_internal.h
@@ -83,7 +83,9 @@
 /* The maximum number of patterns that can be transmitted by the firmware
  *  and maximum patterns size.
  */
+#ifndef WMA_MAXNUM_PERIODIC_TX_PTRNS
 #define WMA_MAXNUM_PERIODIC_TX_PTRNS 6
+#endif
 
 #define WMI_MAX_HOST_CREDITS 2
 #define WMI_WOW_REQUIRED_CREDITS 1
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index 6e946f71ee8a..ac9e352adad6 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -287,6 +287,7 @@ static void wma_set_default_tgt_config(tp_wma_handle wma_handle,
 		CFG_TGT_MAX_MULTICAST_FILTER_ENTRIES;
 	tgt_cfg->num_wow_filters = 0;
 	tgt_cfg->num_keep_alive_pattern = WMA_MAXNUM_PERIODIC_TX_PTRNS;
+	tgt_cfg->num_max_sta_vdevs = CFG_TGT_DEFAULT_MAX_STA_VDEVS;
 	tgt_cfg->keep_alive_pattern_size = 0;
 	tgt_cfg->max_tdls_concurrent_sleep_sta =
 		CFG_TGT_NUM_TDLS_CONC_SLEEP_STAS;