diff --git a/gps/apdr.conf b/gps/apdr.conf
index 5a9a922..ea2ec52 100644
--- a/gps/apdr.conf
+++ b/gps/apdr.conf
@@ -69,11 +69,6 @@ QDR_CAN_TYPE = 14
 ##Reporting offset before PPS boundary
 QDR_REPORTING_OFFSET = 20
 #
-##QDR_ENABLE_QG shall be set as 1
-QDR_ENABLE_QG = 1
-#GEAR Optimisation
-QG_GEAR_ON_CHANGE=1
-#
 
 ##Vehicle Sensor Configuration (CAN data availability)
 ##QDR_VEH_SENSOR_CONFIG:
diff --git a/gps/gnss_antenna_info.conf b/gps/gnss_antenna_info.conf
index 79a2aef..e037daa 100644
--- a/gps/gnss_antenna_info.conf
+++ b/gps/gnss_antenna_info.conf
@@ -80,7 +80,8 @@
 # NUMBER_OF_ROWS_SGC_ and NUMBER_OF_COLUMNS_SGC_ represent the number of
 # rows/columns for signal gain corrections
 
-ANTENNA_INFO_VECTOR_SIZE = 2
+# ANTENNA_INFO_VECTOR_SIZE must be non zero if antenna corrections are sent
+# ANTENNA_INFO_VECTOR_SIZE = 2
 
 CARRIER_FREQUENCY_0 = 1575.42
 
diff --git a/gps/gps.conf b/gps/gps.conf
index b9324d6..75f12f2 100644
--- a/gps/gps.conf
+++ b/gps/gps.conf
@@ -1,13 +1,3 @@
-#Socket keepalive, 1=enable, 0=disable
-XTRA_SOCK_KEEPALIVE=1
-
-#Version check for XTRA
-#DISABLE = 0
-#AUTO    = 1
-#XTRA2   = 2
-#XTRA3   = 3
-XTRA_VERSION_CHECK=1
-
 # Error Estimate
 # _SET = 1
 # _CLEAR = 0
@@ -22,13 +12,13 @@ XTRA_CA_PATH=/usr/lib/ssl-1.1/certs
 # DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
 #               4 - Debug, 5 - Verbose
 # If DEBUG_LEVEL is commented, Android's logging levels will be used
-DEBUG_LEVEL = 2
+DEBUG_LEVEL = 3
 
 # Intermediate position report, 1=enable, 0=disable
 INTERMEDIATE_POS=0
 
-# supl version 2.0
-SUPL_VER=0x20000
+# supl version 1.0
+SUPL_VER=0x10000
 
 # Emergency SUPL, 1=enable, 0=disable
 #SUPL_ES=1
@@ -43,7 +33,7 @@ SUPL_VER=0x20000
 #config.xml.
 #MSA=0X2
 #MSB=0X1
-SUPL_MODE=3
+#SUPL_MODE=
 
 # GPS Capabilities bit mask
 # SCHEDULING = 0x01
@@ -64,8 +54,6 @@ CAPABILITIES=0x17
 # FOR SUPL SUPPORT, set the following
 # SUPL_HOST=supl.host.com or IP
 # SUPL_PORT=1234
-SUPL_HOST=supl.google.com
-SUPL_PORT=7275
 
 # FOR MO SUPL SUPPORT, set the following
 # MO_SUPL_HOST=supl.host.com or IP
@@ -92,7 +80,7 @@ SUPL_PORT=7275
 # 0x2: LPP Control Plane
 # 0x4: LPP User Plane for NR5G
 # 0x8: LPP Control Plane for NR5G
-LPP_PROFILE = 3
+LPP_PROFILE = 2
 
 ####################################
 #Datum Type
@@ -107,6 +95,15 @@ DATUM_TYPE = 0
 # NMEA provider (1=Modem Processor, 0=Application Processor)
 NMEA_PROVIDER=0
 
+################################
+# NMEA TAG BLOCK GROUPING
+################################
+# NMEA tag block grouping is only applicable to GSA
+# Default is disabled
+# 0 - disabled
+# 1 - enabled
+NMEA_TAG_BLOCK_GROUPING_ENABLED = 0
+
 # Customized NMEA GGA fix quality that can be used to tell
 # whether SENSOR contributed to the fix.
 #
@@ -158,7 +155,7 @@ A_GLONASS_POS_PROTOCOL_SELECT = 0
 # 0x2: WLAN AP Measurements for LPPe CP
 # 0x4: SRN AP measurement for CP
 # 0x8: Sensor Barometer Measurement LPPe CP
-LPPE_CP_TECHNOLOGY = 0
+#LPPE_CP_TECHNOLOGY = 0
 
 ##################################################
 # Select technology for LPPe User Plane
@@ -311,7 +308,7 @@ MODEM_TYPE = 1
 #####################################
 # This is a string that is sent to the framework
 # in nfwNotifyCb callback
-PROXY_APP_PACKAGE_NAME = com.oneplus.carrierlocation
+PROXY_APP_PACKAGE_NAME = com.google.android.carrierlocation
 
 #####################################
 # CP_MTLR_ES
diff --git a/gps/izat.conf b/gps/izat.conf
index e236d24..2585a8a 100644
--- a/gps/izat.conf
+++ b/gps/izat.conf
@@ -107,7 +107,7 @@ GTP_WAA=DISABLED
 # PREMIUM
 # PREMIUM_ENV_AIDING
 # MODEM_DEFAULT
-SAP=PREMIUM
+SAP=MODEM_DEFAULT
 
 #FREE_WIFI_SCAN_INJECT valid modes:
 #DISABLED
@@ -181,7 +181,7 @@ IZAT_FEATURE_MASK=0xf303
 PLATFORMS=all
 SOC_IDS=all
 BASEBAND=all
-LOW_RAM_TARGETS=DISABLED
+LOW_RAM_TARGETS=ENABLED
 HARDWARE_TYPE=all
 VENDOR_ENHANCED_PROCESS=0
 
@@ -192,9 +192,9 @@ PROCESS_GROUPS=inet gps
 PREMIUM_FEATURE=1
 IZAT_FEATURE_MASK=0xc03
 PLATFORMS=all
-SOC_IDS=all exclude 386 436
+SOC_IDS=all
 BASEBAND=all
-LOW_RAM_TARGETS=DISABLED
+LOW_RAM_TARGETS=ENABLED
 HARDWARE_TYPE=all
 VENDOR_ENHANCED_PROCESS=1
 
@@ -205,15 +205,15 @@ PROCESS_GROUPS=wifi inet gps system oem_2904
 PREMIUM_FEATURE=1
 IZAT_FEATURE_MASK=0xd03
 PLATFORMS=all
-SOC_IDS=all exclude 386 436
+SOC_IDS=all
 BASEBAND=all
-LOW_RAM_TARGETS=DISABLED
+LOW_RAM_TARGETS=ENABLED
 HARDWARE_TYPE=all
 VENDOR_ENHANCED_PROCESS=1
 
 PROCESS_NAME=slim_daemon
 PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
+PROCESS_STATE=ENABLED
 PROCESS_GROUPS=gps oem_2901 can plugdev diag sensors
 PREMIUM_FEATURE=1
 IZAT_FEATURE_MASK=0xf0
diff --git a/gps/lowi.conf b/gps/lowi.conf
index 6d4de75..83ab1bf 100644
--- a/gps/lowi.conf
+++ b/gps/lowi.conf
@@ -22,6 +22,6 @@
 
 # Log level
 # EL_LOG_OFF = 0, EL_ERROR = 1, EL_WARNING = 2, EL_INFO = 3, EL_DEBUG = 4, EL_VERBOSE = 5, EL_LOG_ALL = 100
-LOWI_LOG_LEVEL = 2
+LOWI_LOG_LEVEL = 4
 LOWI_USE_LOWI_LP = 0