diff --git a/device-caiman.mk b/device-caiman.mk
index 89773c8c..e0ead1d3 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -227,7 +227,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Location
 # iGNSS
--include vendor/samsung_slsi/gps/s5400/device-gnss.mk
+include device/google/gs-common/gps/lsi/s5400.mk
 # gps.cfg
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/caiman
 $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))
diff --git a/device-komodo.mk b/device-komodo.mk
index 8778f3a0..78b066c5 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -245,7 +245,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Location
 # iGNSS
--include vendor/samsung_slsi/gps/s5400/device-gnss.mk
+include device/google/gs-common/gps/lsi/s5400.mk
 # gps.cfg
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/komodo
 $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))
diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk
index 91246728..591853b6 100644
--- a/device-ripcurrent24.mk
+++ b/device-ripcurrent24.mk
@@ -199,7 +199,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts
 
 # Location
 # iGNSS
--include vendor/samsung_slsi/gps/s5400/device-gnss.mk
+include device/google/gs-common/gps/lsi/s5400.mk
 # gps.cfg
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/ripcurrent24
 $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))
diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk
index d6371842..dfc4e082 100644
--- a/device-ripcurrentpro.mk
+++ b/device-ripcurrentpro.mk
@@ -201,7 +201,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts
 
 # Location
 # iGNSS
--include vendor/samsung_slsi/gps/s5400/device-gnss.mk
+include device/google/gs-common/gps/lsi/s5400.mk
 # gps.cfg
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/ripcurrentpro
 $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))
diff --git a/device-tokay.mk b/device-tokay.mk
index 0592a63f..395bd562 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -217,7 +217,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts
 
 # Location
 # iGNSS
--include vendor/samsung_slsi/gps/s5400/device-gnss.mk
+include device/google/gs-common/gps/lsi/s5400.mk
 # gps.cfg
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/tokay
 $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))