diff --git a/location/gnssd/release/gps.cfg b/location/gnssd/release/gps.cfg
index 8e67133..fc32a7e 100644
--- a/location/gnssd/release/gps.cfg
+++ b/location/gnssd/release/gps.cfg
@@ -208,7 +208,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
@@ -235,6 +235,7 @@ ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 SUPL_UT2_SEC=10
 SUPL_UT3_SEC=30
+SUPL_SSL_METHOD=TLSv1_2
 # AIRTEL
 GNSS_CARRIER_ID=4
 # RAKUTEN
diff --git a/location/gnssd/release/gps_user.cfg b/location/gnssd/release/gps_user.cfg
index 64aaa63..ed40ec5 100644
--- a/location/gnssd/release/gps_user.cfg
+++ b/location/gnssd/release/gps_user.cfg
@@ -90,7 +90,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
@@ -114,6 +114,7 @@ ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 SUPL_UT2_SEC=10
 SUPL_UT3_SEC=30
+SUPL_SSL_METHOD=TLSv1_2
 GNSS_CARRIER_ID=4
 GNSS_CARRIER_ID=5
 ENABLE_LPP_UP=1
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index ff45641..90eac04 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -171,4 +171,7 @@
                re-activated when the device exits idle mode.
          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>