diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini
index bc9c7d7..198cef5 100644
--- a/WCNSS_qcom_cfg.ini
+++ b/WCNSS_qcom_cfg.ini
@@ -542,8 +542,6 @@ isP2pDeviceAddrAdministrated=0
 gGoKeepAlivePeriod = 20
 gApKeepAlivePeriod = 20
 
-gGoForce11NFor11AC=1
-
 #############################################
 # SAP related configurations
 #############################################
@@ -574,9 +572,6 @@ gAPChannelSelectEndChannel=11
 # DFS Master Capability
 gEnableDFSMasterCap=1
 
-# Disable 11AC for hotspot
-gSapForce11NFor11AC=1
-
 #Auto Shutdown  Value in seconds. A value of 0 means Auto shutoff is disabled
 gAPAutoShutOff=0
 
diff --git a/walleye/overlay/frameworks/base/core/res/res/values/config.xml b/walleye/overlay/frameworks/base/core/res/res/values/config.xml
index d981679..702f845 100644
--- a/walleye/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/walleye/overlay/frameworks/base/core/res/res/values/config.xml
@@ -166,4 +166,11 @@
     <!-- If true, the doze component is not started until after the screen has been
          turned off and the screen off animation has been performed. -->
     <bool name="config_dozeAfterScreenOff">true</bool>
+
+    <!-- Enable ACS (auto channel selection) for Wifi hotspot (SAP) -->
+    <bool translatable="false" name="config_wifi_softap_acs_supported">true</bool>
+
+    <!-- Enable 802.11ac for Wifi hotspot (SAP) -->
+    <bool translatable="false" name="config_wifi_softap_ieee80211ac_supported">true</bool>
+
 </resources>