diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index dc3055a..7885c16 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -113,18 +113,6 @@
     <!-- Enable adding minimum confirmation duration when sending network score to connectivity service. -->
     <bool translatable="false" name="config_wifiMinConfirmationDurationSendNetworkScoreEnabled">true</bool>
 
-    <!-- Enable concurrent STA + STA peer to peer + internet connectivity -->
-    <bool translatable="false" name="config_wifiMultiStaLocalOnlyConcurrencyEnabled">true</bool>
-
-    <!-- Enable concurrent STA + STA MBB support -->
-    <bool translatable="false" name="config_wifiMultiStaNetworkSwitchingMakeBeforeBreakEnabled">true</bool>
-
-    <!-- Enable concurrent Bridged access point (AP) support -->
-    <bool translatable="false" name="config_wifiBridgedSoftApSupported">true</bool>
-
-    <!-- Enable concurrent STA + Bridged access point (AP) support -->
-    <bool translatable="false" name="config_wifiStaWithBridgedSoftApConcurrencySupported">true</bool>
-
     <!-- Indicates that SAE Hash-to-Element is supported on this device -->
     <bool translatable="false" name="config_wifiSaeH2eSupported">true</bool>
 
@@ -153,14 +141,22 @@
     <!-- Boolean indicating whether we should enable the STA current connected indoor channel
      for SAP, WFD GO, Wi-Fi Aware -->
     <bool translatable="false" name="config_wifiEnableStaIndoorChannelForPeerNetwork">true</bool>
-    <!-- Boolean indicating whether the framework updates country from scan results when there is
-         no telephony country code and driver country code is 00.
-         This is applied only during the setup wizard -->
-    <bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultSetupWizard">true</bool>
+    <!-- Boolean indicating whether we should enable the STA current connected DFS channel
+         for SAP, WFD GO, Wi-Fi Aware -->
+    <bool translatable="false" name="config_wifiEnableStaDfsChannelForPeerNetwork">true</bool>
 
+    <!-- Enable WPA2 to WPA3 auto-upgrade offload to capable Driver/Firmware -->
+    <bool translatable="false" name="config_wifiSaeUpgradeOffloadEnabled">true</bool>
     <!-- Enable the feature of adjusting link layer stats polling interval based on
     device mobility state and client mode RSSI monitoring. -->
     <bool translatable="false" name="config_wifiAdjustPollRssiIntervalEnabled">true</bool>
 
-    <bool translatable="false" name="config_wifiSaeUpgradeEnabled">false</bool>
+    <!-- Boolean indicating whether the framework updates country from scan results when there is
+         no telephony country code. This is applied to all generic cases and might require the
+         regulatory approval (for example, FCC pre-approval is required according to "594280 D01
+         Software Configuration Control v02r01").-->
+    <bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultGeneric">true</bool>
+
+    <!-- boolean indicating whether the caller thread needs to wait for destroyed listeners -->
+    <bool translatable="false" name ="config_wifiWaitForDestroyedListeners">true</bool>
 </resources>
diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk
index 7011ccf..219a1d8 100644
--- a/wifi/BoardConfig-wifi.mk
+++ b/wifi/BoardConfig-wifi.mk
@@ -21,9 +21,9 @@ BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd
 WPA_SUPPLICANT_VERSION := VER_0_8_X
 BOARD_WPA_SUPPLICANT_DRIVER := NL80211
 BOARD_HOSTAPD_DRIVER := NL80211
-# Wifi interface combination - {1 STA + 1 AP} or {1 STA + 1 AP_BRIDGED} or {1 STA + 1 P2P}
-# or {1 STA + 1 NAN} or {2 STA}
-WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{P2P, NAN, AP, AP_BRIDGED}, 1}}, {{{STA}, 2}}
+# Wifi interface combination - {1 STA + 1 AP} or {1 STA + 1 P2P}
+# or {1 STA + 1 NAN}
+WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{P2P, NAN, AP}, 1}}
 WIFI_FEATURE_WIFI_EXT_HAL := true
 WIFI_FEATURE_IMU_DETECTION := true
 # Avoid Wifi reset on MAC Address change
diff --git a/wifi/p2p_supplicant_overlay.conf b/wifi/p2p_supplicant_overlay.conf
index 4ec8453..ad1a42b 100644
--- a/wifi/p2p_supplicant_overlay.conf
+++ b/wifi/p2p_supplicant_overlay.conf
@@ -8,3 +8,5 @@ p2p_add_cli_chan=1
 disable_scan_offload=1
 p2p_go_vht=1
 p2p_pref_chan=124:149, 115:36
+p2p_dfs_chan_enable=1
+p2p_6ghz_disable=1