diff --git a/location/gnssd/release/android.hardware.gnss-service b/location/gnssd/release/android.hardware.gnss-service
index f325fda..4df0762 100644
Binary files a/location/gnssd/release/android.hardware.gnss-service and b/location/gnssd/release/android.hardware.gnss-service differ
diff --git a/location/gnssd/release/gnssd b/location/gnssd/release/gnssd
index 5bde350..70aef71 100644
Binary files a/location/gnssd/release/gnssd and b/location/gnssd/release/gnssd differ
diff --git a/location/gnssd/release/gps.cfg b/location/gnssd/release/gps.cfg
index 87c5938..7a6b51f 100644
--- a/location/gnssd/release/gps.cfg
+++ b/location/gnssd/release/gps.cfg
@@ -179,6 +179,8 @@ 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=TLSv1_1
+SUPL_HMAC_HASH=SHA256
 SUPL_UT2_SEC=20
 SUPL_UT3_SEC=20
 ENABLE_LPP_CP=1
@@ -188,6 +190,7 @@ ENABLE_LPPE_UP=0
 ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
+USE_EMER_PDN_FOR_EMER_SUPL=1
 # ATT
 GNSS_CARRIER_ID=1
 # TMO
@@ -203,6 +206,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
@@ -221,6 +225,8 @@ ENABLE_LPP_CP=0
 ENABLE_LPPE_CP=0
 ENABLE_5G_CP_CAPS_MSA=0
 ENABLE_5G_CP_CAPS_MSB=0
+SUPL_SSL_METHOD=TLSv1
+USE_EMER_PDN_FOR_EMER_SUPL=0
 # DOCOMO
 GNSS_CARRIER_ID=8
 # LAB
diff --git a/location/gnssd/release/gps_user.cfg b/location/gnssd/release/gps_user.cfg
index a200081..a27a077 100644
--- a/location/gnssd/release/gps_user.cfg
+++ b/location/gnssd/release/gps_user.cfg
@@ -175,6 +175,8 @@ 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=TLSv1_1
+SUPL_HMAC_HASH=SHA256
 SUPL_UT2_SEC=20
 SUPL_UT3_SEC=20
 ENABLE_LPP_CP=1
@@ -184,6 +186,7 @@ ENABLE_LPPE_UP=0
 ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
+USE_EMER_PDN_FOR_EMER_SUPL=1
 # ATT
 GNSS_CARRIER_ID=1
 # TMO
@@ -199,6 +202,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
@@ -217,6 +221,8 @@ ENABLE_LPP_CP=0
 ENABLE_LPPE_CP=0
 ENABLE_5G_CP_CAPS_MSA=0
 ENABLE_5G_CP_CAPS_MSB=0
+SUPL_SSL_METHOD=TLSv1
+USE_EMER_PDN_FOR_EMER_SUPL=0
 # DOCOMO
 GNSS_CARRIER_ID=8
 # LAB