diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index 626270f..33da69e 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -28,13 +28,13 @@ bdsUsedInUSPolicy=2
 sbasUsedInUSPolicy=2
 qzssUsedInUSPolicy=2
 navicUsedInUSPolicy=2
-Chip_Configuration_FeatureCfg_DVS = 0
-Chip_Configuration_FeatureCfg_DFS = 0
+Chip_Configuration_FeatureCfg_DVS = 1
+Chip_Configuration_FeatureCfg_DFS = 1
 mailboxDisabled=0x0
 gnss_rfic_chip_id=55400000
 UseRtcForAiding=1
 additional_rtc_uncertainty_ms=10
-Sif_UseFwXtraInterface=0
+Sif_UseFwXtraInterface=1
 Agnss_IsGloAidingEnable=0
 SETCaps_IsOtdoa=1
 SETCaps_IsLpp=1
@@ -61,7 +61,7 @@ RfPathLossDb_L5_Ap=4300
 RfPathLossDb_L5_Cp=4300
 IsUseEntireRespTime911=1
 isForceHighAccuracyMode=1
-isUseUncalAccel=0
+isUseUncalAccel=1
 
 GNSS_CARRIER_CONFIG_BEGIN
 GNSS_CARRIER_ID=0
@@ -127,7 +127,6 @@ 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
 
 GNSS_CARRIER_ID=8
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index f0d4438..3d631ad 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -12,7 +12,7 @@ uni_log_max_file_count=5
 uni_log_max_size_mb=20
 uni_log_total_max_size_mb=100
 
-debug_enable=1
+debug_enable=4
 mem_dump_to_node=1
 
 gnss_device_type=K042
@@ -115,8 +115,8 @@ navicUsedInUSPolicy=2
 
 # DVS: 0 = Disabled, 1 = Enabled (default)
 # DFS: 0 = Disabled, 1 = Enabled (default)
-Chip_Configuration_FeatureCfg_DVS = 0
-Chip_Configuration_FeatureCfg_DFS = 0
+Chip_Configuration_FeatureCfg_DVS = 1
+Chip_Configuration_FeatureCfg_DFS = 1
 
 # This is a bitfield that will disable incoming interrupts for mailboxes
 # AP   = 0x1
@@ -145,7 +145,7 @@ UseRtcForAiding=1
 additional_rtc_uncertainty_ms=10
 
 # set to 1 for FW SGEE download - Requires Android FW to be properly configured
-Sif_UseFwXtraInterface=0
+Sif_UseFwXtraInterface=1
 
 # ChipCfg_GetGpsWeekFloor variable allows testing of old GPS weeks.
 # Used here to adjust the GPS week for carrier testing.
@@ -193,7 +193,7 @@ IsUseEntireRespTime911=1
 isForceHighAccuracyMode=1
 
 # 0: Use calibrated Accel data 1: Use uncalibrated Accel data
-isUseUncalAccel=0
+isUseUncalAccel=1
 
 GNSS_CARRIER_CONFIG_BEGIN
 # DEFAULT
@@ -260,7 +260,6 @@ 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