diff --git a/configs/gps/gps_psds.conf b/configs/gps/gps_psds.conf
new file mode 100644
index 0000000000000000000000000000000000000000..29436722393093c8e48f028eebd1f4384001528f
--- /dev/null
+++ b/configs/gps/gps_psds.conf
@@ -0,0 +1,5 @@
+NTP_SERVER=north-america.pool.ntp.org
+XTRA_SERVER_1=https://glltos1.glpals.com/4day/v5/latest/lto2.dat
+XTRA_SERVER_2=https://glltos2.glpals.com/4day/v5/latest/lto2.dat
+SUPL_HOST=supl.google.com
+SUPL_PORT=7275
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index b2032abd453ee0489861b4eee5213b9b96b245e9..32bcf49158b0fe412b7a5e610b639183263df768 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -80,8 +80,11 @@
 
     <!-- Values for GPS configuration -->
     <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
         <item>XTRA_SERVER_1=https://glltos1.glpals.com/4day/v5/latest/lto2.dat</item>
         <item>XTRA_SERVER_2=https://glltos2.glpals.com/4day/v5/latest/lto2.dat</item>
+        <item>NTP_SERVER=north-america.pool.ntp.org</item>
     </string-array>
 
     <!-- Whether WiFi display is supported by this device.
diff --git a/rootdir/etc/init.samsungexynos9810.rc b/rootdir/etc/init.samsungexynos9810.rc
index 7dbe23f382cbd95f8b05745423c7786c615330a5..6899ed0383178798b4342cb29e819708c9fe3235 100755
--- a/rootdir/etc/init.samsungexynos9810.rc
+++ b/rootdir/etc/init.samsungexynos9810.rc
@@ -313,6 +313,9 @@ on post-fs-data
 
     setprop vold.post_fs_data_done 1
 
+    # GnssConfiguration doesn't actually look at gps_psds.conf, just the debug file
+    mount none /system/etc/gps_psds.conf /system/etc/gps_debug.conf bind
+
 # Permissions for audio
     chown system radio /sys/class/audio/earjack/key_state
     chown system radio /sys/class/audio/earjack/mic_adc
diff --git a/sepolicy/private/init.te b/sepolicy/private/init.te
index 2117a73ae102e7712709dc56e00bb51656a0dfd9..db89113c9b448fc5a3cc9953dd17eed25eb503a1 100644
--- a/sepolicy/private/init.te
+++ b/sepolicy/private/init.te
@@ -15,3 +15,6 @@ allow init runtime_event_log_tags_file:file getattr;
 allow init ram_device:blk_file write;
 allow init sysfs_zram:file { create_file_perms rw_file_perms };
 allow init sysfs_zram:dir r_dir_perms;
+
+# Allow init to bind mount over system files
+allow init system_file:file mounton;
diff --git a/universal9810-common.mk b/universal9810-common.mk
index 0e04e73f405f3686c785c31dd80eee183295dc9d..cd8d26e99628681cbf65590e5fcf31cf26201337 100644
--- a/universal9810-common.mk
+++ b/universal9810-common.mk
@@ -107,6 +107,10 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.freeform_window_management.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/android.software.freeform_window_management.xml \
     frameworks/native/data/etc/android.software.picture_in_picture.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/android.software.picture_in_picture.xml
 
+# GPS
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/gps/gps_psds.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/gps_psds.conf
+    
 # Soong
 PRODUCT_SOONG_NAMESPACES += $(LOCAL_PATH)