diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index f36b304e..cb930ed9 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -134,7 +134,8 @@ TARGET_EXFAT_DRIVER := exfat
 
 # GPS
 BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := default
-LOC_HIDL_VERSION := 3.0
+GNSS_HIDL_VERSION := 2.1
+LOC_HIDL_VERSION := 4.0
 
 # HIDL
 DEVICE_FRAMEWORK_MANIFEST_FILE := $(COMMON_PATH)/framework_manifest.xml
diff --git a/sdm660.mk b/sdm660.mk
index 3bf675f9..11a45a63 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -239,8 +239,8 @@ PRODUCT_GMS_CLIENTID_BASE := android-xiaomi
 
 # GPS / Location
 PRODUCT_PACKAGES += \
-    android.hardware.gnss@2.0-impl-qti \
-    android.hardware.gnss@2.0-service-qti \
+    android.hardware.gnss@2.1-impl-qti \
+    android.hardware.gnss@2.1-service-qti \
     libbatching \
     libgeofencing \
     libgnss \