diff --git a/location/gps.cfg b/location/gps.cfg
index 089b711..c801b4c 100644
--- a/location/gps.cfg
+++ b/location/gps.cfg
@@ -106,11 +106,15 @@ Chip_Configuration_WatchdogPeriod = 0
 Chip_Configuration_GNSSConstConstraintDef=0x602F
 Chip_Configuration_RfMiscCtrl=0x80008001
 
-# Disable BDS in the U.S.
-bdsUsedInUSPolicy=2
-sbasUsedInUSPolicy=2
-qzssUsedInUSPolicy=2
-navicUsedInUSPolicy=2
+# Certain constellation permission overriding LocTech config setting: only to possibly
+# disallow constellations allowed in LocTech, not vice versa. Note: GPS and GAL are
+# allowed in all markets so no such overriding.
+# 0: not to override (default), 1-disabled, 2- disabled if in US
+#gloUsedPolicy=2
+bdsUsedPolicy=2
+sbasUsedPolicy=2
+qzssUsedPolicy=2
+navicUsedPolicy=2
 
 # DVS: 0 = Disabled (default), 1 = Enabled
 # DFS: 0 = Disabled (default), 1 = Enabled
@@ -159,7 +163,9 @@ Chip_Configuration_FeatureCfg_ACT = 5
 
 ChipCfg_DspMemdumpEnable=1
 
-Agnss_IsGloAidingEnable=0
+Agnss_IsGloAidingEnable=1
+Agnss_IsGalAidingEnable=1
+Agnss_IsBdsAidingEnable=1
 Agnss_SuplUseCpNi=1
 Agnss_SuplAidIntvlCrossSess=1
 SETCaps_IsOtdoa=1
@@ -227,8 +233,11 @@ ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 # ATT
 GNSS_CARRIER_ID=1
+CP_LOCTECH_CONSTRAINTS=5
 # TMO
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
diff --git a/location/gps_user.cfg b/location/gps_user.cfg
index fabc19f..36180f1 100644
--- a/location/gps_user.cfg
+++ b/location/gps_user.cfg
@@ -31,10 +31,10 @@ spam_dog_ms=0
 Chip_Configuration_WatchdogPeriod = 0
 Chip_Configuration_GNSSConstConstraintDef=0x602F
 Chip_Configuration_RfMiscCtrl=0x80008001
-bdsUsedInUSPolicy=2
-sbasUsedInUSPolicy=2
-qzssUsedInUSPolicy=2
-navicUsedInUSPolicy=2
+bdsUsedPolicy=2
+sbasUsedPolicy=2
+qzssUsedPolicy=2
+navicUsedPolicy=2
 Chip_Configuration_FeatureCfg_DVS = 1
 Chip_Configuration_FeatureCfg_DFS = 1
 Chip_Configuration_FeatureCfg_MTPL=0
@@ -46,7 +46,9 @@ additional_rtc_uncertainty_ms=10
 Sif_UseFwXtraInterface=1
 Chip_Configuration_FeatureCfg_ACT = 5
 ChipCfg_DspMemdumpEnable=1
-Agnss_IsGloAidingEnable=0
+Agnss_IsGloAidingEnable=1
+Agnss_IsGalAidingEnable=1
+Agnss_IsBdsAidingEnable=1
 Agnss_SuplUseCpNi=1
 Agnss_SuplAidIntvlCrossSess=1
 SETCaps_IsOtdoa=1
@@ -106,7 +108,10 @@ ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
 USE_EMER_PDN_FOR_EMER_SUPL=1
+CP_LOCTECH_CONSTRAINTS=1
+UP_LOCTECH_CONSTRAINTS=1
 GNSS_CARRIER_ID=1
+CP_LOCTECH_CONSTRAINTS=5
 GNSS_CARRIER_ID=2
 ENABLE_3G_CP_CAPS_MSA=0
 ENABLE_4G_CP_CAPS_MSA=0