diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index f60a472..d41a982 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -114,7 +114,7 @@ ENABLE_4G_UP_CAPS_MSA=1
 ENABLE_4G_UP_CAPS_MSB=1
 ENABLE_5G_UP_CAPS_MSA=0
 ENABLE_5G_UP_CAPS_MSB=0
-SUPL_SSL_METHOD=SSLv23
+SUPL_SSL_METHOD=TLSv1_1
 SUPL_HMAC_HASH=SHA256
 SUPL_UT2_SEC=20
 SUPL_UT3_SEC=20
@@ -143,6 +143,7 @@ ENABLE_LPP_HA_GAD_SHAPE=1
 GNSS_CARRIER_ID=3
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
+SUPL_SSL_METHOD=TLSv1_2
 SUPL_UT2_SEC=10
 SUPL_UT3_SEC=30
 
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index ea6e850..0641d1f 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -277,7 +277,7 @@ ENABLE_4G_UP_CAPS_MSA=1
 ENABLE_4G_UP_CAPS_MSB=1
 ENABLE_5G_UP_CAPS_MSA=0
 ENABLE_5G_UP_CAPS_MSB=0
-SUPL_SSL_METHOD=SSLv23
+SUPL_SSL_METHOD=TLSv1_1
 SUPL_HMAC_HASH=SHA256
 SUPL_UT2_SEC=20
 SUPL_UT3_SEC=20
@@ -306,6 +306,7 @@ ENABLE_LPP_HA_GAD_SHAPE=1
 GNSS_CARRIER_ID=3
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
+SUPL_SSL_METHOD=TLSv1_2
 SUPL_UT2_SEC=10
 SUPL_UT3_SEC=30
 # AIRTEL
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index bbec9df..49fe3c4 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -193,4 +193,6 @@
          false: firmware roaming will not be affected. -->
     <bool translatable="false" name ="config_wifiDisableFirmwareRoamingInIdleMode">true</bool>
 
+    <!-- Boolean indicating whether to trigger bugreport for WiFi subsystem restart issue -->
+    <bool translatable="false" name ="config_wifi_subsystem_restart_bugreport_enabled">false</bool>
 </resources>