diff --git a/configs/genoa.common b/configs/genoa.common
index e7b9b2d58f42..256f7f2b85d7 100644
--- a/configs/genoa.common
+++ b/configs/genoa.common
@@ -4,7 +4,6 @@
 CONFIG_SUPPORT_11AX := y
 CONFIG_160MHZ_SUPPORT := y
 CONFIG_FEATURE_STATS_EXT := n
-CONFIG_QCA_IBSS_SUPPORT := y
 CONFIG_FEATURE_WLAN_FT_IEEE8021X := y
 CONFIG_FEATURE_WLAN_FT_PSK := y
 
@@ -25,9 +24,7 @@ CONFIG_POWER_MANAGEMENT_OFFLOAD := y
 CONFIG_LFR_SUBNET_DETECTION := y
 CONFIG_MCC_TO_SCC_SWITCH := y
 CONFIG_QCOM_ESE := n
-CONFIG_WLAN_OPEN_P2P_INTERFACE := y
 CONFIG_WLAN_CONV_SPECTRAL_ENABLE := n
-CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY := y
 CONFIG_WLAN_DFS_MASTER_ENABLE := y
 CONFIG_WIFI_POS_CONVERGED := y
 CONFIG_WIFI_POS_LEGACY := n
@@ -243,4 +240,26 @@ CONFIG_WLAN_FW_OFFLOAD := y
 
 #Enable PCIe Shadow Register
 CONFIG_QCN7605_PCIE_SHADOW_REG_SUPPORT := y
+
+ifeq ($(CONFIG_ARCH_SDXPRAIRIE), y)
+CONFIG_MOBILE_ROUTER := y
+endif
+
+# enable/disable feature flags based upon mobile router profile
+ifeq ($(CONFIG_MOBILE_ROUTER), y)
+CONFIG_FEATURE_WLAN_MCC_TO_SCC_SWITCH := y
+CONFIG_FEATURE_WLAN_AUTO_SHUTDOWN := y
+CONFIG_FEATURE_WLAN_AP_AP_ACS_OPTIMIZE := y
+CONFIG_FEATURE_WLAN_STA_4ADDR_SCHEME := y
+CONFIG_MDM_PLATFORM := y
+CONFIG_FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE := y
+CONFIG_FEATURE_AP_MCC_CH_AVOIDANCE := y
+CONFIG_QCA_IBSS_SUPPORT := n
+CONFIG_WLAN_OPEN_P2P_INTERFACE := n
+CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY := n
+else
+CONFIG_QCA_IBSS_SUPPORT := y
+CONFIG_WLAN_OPEN_P2P_INTERFACE := y
+CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY := y
+endif
 ###################################