diff --git a/location/gnssd/Android.bp b/location/gnssd/Android.bp
index 8eb7537..4133a8a 100644
--- a/location/gnssd/Android.bp
+++ b/location/gnssd/Android.bp
@@ -14,10 +14,10 @@ license {
 }
 
 cc_prebuilt_binary {
-    name: "gnss-aidl-service_IGnssV2_ISlsiGnssV1",
+    name: "android.hardware.gnss-service",
     arch: {
         arm64: {
-            srcs: ["release/gnss-aidl-service_IGnssV2_ISlsiGnssV1"],
+            srcs: ["release/android.hardware.gnss-service"],
             shared_libs: [
                 "liblog",
                 "libutils",
diff --git a/location/gnssd/gnss_release.mk b/location/gnssd/gnss_release.mk
index b1e2850..6d8c79c 100644
--- a/location/gnssd/gnss_release.mk
+++ b/location/gnssd/gnss_release.mk
@@ -3,7 +3,7 @@ GPS_ROOT := device/google/akita/location/gnssd
 
 PRODUCT_PACKAGES += \
     gnssd \
-    gnss-aidl-service_IGnssV2_ISlsiGnssV1 \
+    android.hardware.gnss-service \
     android.hardware.location.gps.prebuilt.xml
 
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/location/gnssd/init.gnss.rc b/location/gnssd/init.gnss.rc
index 8b26546..3ccf274 100644
--- a/location/gnssd/init.gnss.rc
+++ b/location/gnssd/init.gnss.rc
@@ -27,7 +27,7 @@ service gnssd /vendor/bin/hw/gnssd
     ioprio be 0
     seclabel u:r:gnssd:s0
 
-service slsi_gnss_service /vendor/bin/hw/gnss-aidl-service_IGnssV2_ISlsiGnssV1
+service slsi_gnss_service /vendor/bin/hw/android.hardware.gnss-service
     class main
     user system
     group system gps
diff --git a/location/gnssd/release/android.hardware.gnss-service b/location/gnssd/release/android.hardware.gnss-service
new file mode 100644
index 0000000..529f50d
Binary files /dev/null and b/location/gnssd/release/android.hardware.gnss-service differ
diff --git a/location/gnssd/release/gnss-aidl-service_IGnssV2_ISlsiGnssV1 b/location/gnssd/release/gnss-aidl-service_IGnssV2_ISlsiGnssV1
deleted file mode 100644
index e3ddb44..0000000
Binary files a/location/gnssd/release/gnss-aidl-service_IGnssV2_ISlsiGnssV1 and /dev/null differ
diff --git a/location/gnssd/release/gnssd b/location/gnssd/release/gnssd
index 5c2d078..c52c1eb 100644
Binary files a/location/gnssd/release/gnssd and b/location/gnssd/release/gnssd differ
diff --git a/location/gnssd/release/gps.cfg b/location/gnssd/release/gps.cfg
index 31a1c81..7ec630c 100644
--- a/location/gnssd/release/gps.cfg
+++ b/location/gnssd/release/gps.cfg
@@ -75,7 +75,7 @@ Chip_Configuration_DCXO_CrystalType=0x11
 spam_dog_ms=0
 
 ### 2C48 L1 only MCW ###
-Chip_Configuration_GNSSConstConstraintDef=0x602F
+Chip_Configuration_GNSSConstConstraintDef=0x603F
 Chip_Configuration_RfMiscCtrl=0x80008001
 
 # DVS: 0 = Disabled (default), 1 = Enabled