diff --git a/conf/init.comet.rc b/conf/init.comet.rc
index 6e9dfc6..09d29dc 100644
--- a/conf/init.comet.rc
+++ b/conf/init.comet.rc
@@ -152,3 +152,10 @@ on property:sys.boot_completed=1
 # it should be written by the system init.
 on property:ro.boot.hardware.sku=GC15S
     setprop audio.camerasound.force true
+
+# Enable bootstrap for US devices
+on boot && property:ro.boot.warranty.sku=UVZ
+    setprop setupwizard.feature.provisioning_profile_mode true
+on boot && property:ro.boot.warranty.sku=UTM
+    setprop setupwizard.feature.provisioning_profile_mode true
+
diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index 18fa6b4..392b06f 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -34,7 +34,7 @@ qzssUsedInUSPolicy=2
 navicUsedInUSPolicy=2
 Chip_Configuration_FeatureCfg_DVS = 1
 Chip_Configuration_FeatureCfg_DFS = 1
-Chip_Configuration_FeatureCfg_MTPL = 1
+Chip_Configuration_FeatureCfg_MTPL = 0
 Chip_Configuration_FeatureCfg_SDL_BYASS = 1
 mailboxDisabled=0x0
 gnss_rfic_chip_id=55400000
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 802d006..e3f79ea 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -123,8 +123,8 @@ navicUsedInUSPolicy=2
 # DFS: 0 = Disabled, 1 = Enabled (default)
 Chip_Configuration_FeatureCfg_DVS = 1
 Chip_Configuration_FeatureCfg_DFS = 1
-# MTPL: 0 = Disabled, 1 = Enabled
-Chip_Configuration_FeatureCfg_MTPL = 1
+# Disable MTPL
+Chip_Configuration_FeatureCfg_MTPL = 0
 # MCW Link failure behavior: 0 = SW Assert (default), 1 = GNSS restart (hot start)
 Chip_Configuration_FeatureCfg_SDL_BYASS = 1