diff --git a/overlay/WifiResCommon_Sys/res/values/config.xml b/overlay/WifiResCommon_Sys/res/values/config.xml
index 446153c..5e9ee9b 100644
--- a/overlay/WifiResCommon_Sys/res/values/config.xml
+++ b/overlay/WifiResCommon_Sys/res/values/config.xml
@@ -10,6 +10,9 @@
          is no longer indicative, and a separate config now exists for each band -->
     <bool name="config_wifi5ghzSupport" translatable="false">true</bool>
 
+    <!-- boolean indicating whether or not to auto-upgrade band setting configuration to dual bands during cloud configuration restore when device supported -->
+    <bool name="config_wifiSoftapAutoUpgradeToBridgedConfigWhenSupported" translatable="false">false</bool>
+
     <!-- Boolean indicating whether the wifi chipset supports background scanning mechanism.
          This mechanism allows the host to remain in suspend state and the dongle to actively
          scan and wake the host when a configured SSID is detected by the dongle. This chipset
diff --git a/overlay/WifiResTarget/res/values/bools.xml b/overlay/WifiResTarget/res/values/bools.xml
deleted file mode 100644
index 96be1d5..0000000
--- a/overlay/WifiResTarget/res/values/bools.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2024 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <bool name="config_vendor_softap_beacon_protection_supported">true</bool>
-    <bool name="config_vendor_softap_ocv_supported">true</bool>
-    <bool name="config_wifiConnectedFrequencyEnhancementEnabled">true</bool>
-    <bool name="config_wifi_framework_enable_quick_connect">true</bool>
-</resources>
diff --git a/overlay/WifiResTarget/res/values/integers.xml b/overlay/WifiResTarget/res/values/integers.xml
deleted file mode 100644
index beb1dd9..0000000
--- a/overlay/WifiResTarget/res/values/integers.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2024 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <integer name="config_wifi_partial_scan_results_fetching_period_ms">1000</integer>
-</resources>
diff --git a/overlay/WifiResTarget_spf/Android.bp b/overlay/WifiResTarget_spf/Android.bp
index 8e0370b..9fc4031 100644
--- a/overlay/WifiResTarget_spf/Android.bp
+++ b/overlay/WifiResTarget_spf/Android.bp
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2022 The LineageOS Project
+// Copyright (C) 2024 The LineageOS Project
 //
 // SPDX-License-Identifier: Apache-2.0
 //
diff --git a/overlay/WifiResTarget_spf/AndroidManifest.xml b/overlay/WifiResTarget_spf/AndroidManifest.xml
index 4a2a801..ff87c29 100644
--- a/overlay/WifiResTarget_spf/AndroidManifest.xml
+++ b/overlay/WifiResTarget_spf/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <!--
-     Copyright (C) 2022 The LineageOS Project
+     Copyright (C) 2024 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/overlay/WifiResTarget_spf/res/values/config.xml b/overlay/WifiResTarget_spf/res/values/config.xml
index 8935493..0b5bf76 100644
--- a/overlay/WifiResTarget_spf/res/values/config.xml
+++ b/overlay/WifiResTarget_spf/res/values/config.xml
@@ -43,4 +43,16 @@
 
     <!-- Indicates that SAE Hash-to-Element is supported on this device -->
     <bool name="config_wifiSaeH2eSupported" translatable="false">true</bool>
+
+    <!-- Indicates whether or not the WLAN driver supports the NL80211_CMD_REG_CHANGE or
+         NL80211_CMD_WIPHY_REG_CHANGE events which indicate the current country code which is
+         being used by the WLAN driver. If the driver doesn't support these events
+         (configuration is `false`) then the driver must handle the setCountryCode request from
+         HAL as a blocking call. In such a case the country code will be applied
+         immediately after the country code is sent to the driver (if the method returns a
+         success). -->
+    <bool name="config_wifiDriverSupportedNl80211RegChangedEvent" translatable="false">true</bool>
+
+    <!-- Indicates whether or not the Soft AP needs to be restarted when country code changed -->
+    <bool name="config_wifiForcedSoftApRestartWhenCountryCodeChanged" translatable="false">false</bool>
 </resources>