diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 7ed00316..27cefc48 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -122,8 +122,8 @@ AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true
 # BOARD_DISABLE_FMRADIO_LIBJNI := true
 
 # GPS
-USE_DEVICE_SPECIFIC_GPS := true
-BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := $(TARGET_BOARD_PLATFORM)
+BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := default
+LOC_HIDL_VERSION := 3.0
 
 # HIDL
 DEVICE_FRAMEWORK_MANIFEST_FILE := $(COMMON_PATH)/framework_manifest.xml
diff --git a/gps/batching/Android.mk b/gps/batching/Android.mk
index b4876cd5..f3e8fe4d 100644
--- a/gps/batching/Android.mk
+++ b/gps/batching/Android.mk
@@ -18,8 +18,7 @@ LOCAL_SHARED_LIBRARIES := \
     liblog \
     libloc_core \
     libgps.utils \
-    libdl \
-    liblbs_core
+    libdl
 
 LOCAL_SRC_FILES += \
     location_batching.cpp \
diff --git a/gps/geofence/Android.mk b/gps/geofence/Android.mk
index 7e0e34e8..133d4080 100644
--- a/gps/geofence/Android.mk
+++ b/gps/geofence/Android.mk
@@ -21,8 +21,7 @@ LOCAL_SHARED_LIBRARIES := \
         libcutils \
         libgps.utils \
         liblog \
-        libloc_core \
-        liblbs_core
+        libloc_core
 
 LOCAL_HEADER_LIBRARIES := \
     libgps.utils_headers \
diff --git a/sdm660.mk b/sdm660.mk
index 372ad59c..6fdeec46 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -200,6 +200,16 @@ PRODUCT_PACKAGES += \
 # GMS
 PRODUCT_GMS_CLIENTID_BASE := android-xiaomi
 
+# GPS / Location
+PRODUCT_PACKAGES += \
+    android.hardware.gnss@2.0-impl-qti \
+    android.hardware.gnss@2.0-service-qti \
+    libbatching \
+    libgeofencing \
+    libgnss \
+    libsensorndkbridge \
+    libwifi-hal-ctrl
+
 # GPS Config
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/gps/etc/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \