diff --git a/device-husky.mk b/device-husky.mk
index 8252d38..007a920 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -246,14 +246,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 
 # Location
 # SDK build system
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-# Release stable version to factory image
-ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
-	include device/google/gs-common/gps/brcm/device.mk
-else
-	include device/google/gs-common/gps/brcm/device_v2.mk
-endif
-endif
+include device/google/gs-common/gps/brcm/device.mk
 
 PRODUCT_COPY_FILES += \
        device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk
index 77d5c9b..b74d75e 100644
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -204,14 +204,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 
 # Location
 # SDK build system
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-# Release stable version to factory image
-ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
-	include device/google/gs-common/gps/brcm/device.mk
-else
-	include device/google/gs-common/gps/brcm/device_v2.mk
-endif
-endif
+include device/google/gs-common/gps/brcm/device.mk
 
 PRODUCT_COPY_FILES += \
        device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
diff --git a/device-shiba.mk b/device-shiba.mk
index 543ce77..280a502 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -236,14 +236,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 
 # Location
 # SDK build system
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-# Release stable version to factory image
-ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
-	include device/google/gs-common/gps/brcm/device.mk
-else
-	include device/google/gs-common/gps/brcm/device_v2.mk
-endif
-endif
+include device/google/gs-common/gps/brcm/device.mk
 
 PRODUCT_COPY_FILES += \
        device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
diff --git a/factory_husky.mk b/factory_husky.mk
index 54cbdd7..5c2c0ce 100644
--- a/factory_husky.mk
+++ b/factory_husky.mk
@@ -19,6 +19,9 @@ TARGET_LINUX_KERNEL_VERSION := 5.15
 $(call inherit-product, device/google/zuma/factory_common.mk)
 $(call inherit-product, device/google/shusky/device-husky.mk)
 include device/google/shusky/audio/husky/factory-audio-tables.mk
+# Override to factory SDK
+$(call soong_config_set, gpssdk, sdkv1, True)
+$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT))
 
 PRODUCT_NAME := factory_husky
 PRODUCT_DEVICE := husky
diff --git a/factory_ripcurrent.mk b/factory_ripcurrent.mk
index 37d0f63..b7c64c5 100644
--- a/factory_ripcurrent.mk
+++ b/factory_ripcurrent.mk
@@ -19,6 +19,9 @@ TARGET_LINUX_KERNEL_VERSION := 5.15
 $(call inherit-product, device/google/zuma/factory_common.mk)
 $(call inherit-product, device/google/shusky/device-ripcurrent.mk)
 include device/google/shusky/audio/ripcurrent/factory-audio-tables.mk
+# Override to factory SDK
+$(call soong_config_set, gpssdk, sdkv1, True)
+$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT))
 
 PRODUCT_NAME := factory_ripcurrent
 PRODUCT_DEVICE := ripcurrent
diff --git a/factory_shiba.mk b/factory_shiba.mk
index 365a2f1..d20f113 100644
--- a/factory_shiba.mk
+++ b/factory_shiba.mk
@@ -19,6 +19,9 @@ TARGET_LINUX_KERNEL_VERSION := 5.15
 $(call inherit-product, device/google/zuma/factory_common.mk)
 $(call inherit-product, device/google/shusky/device-shiba.mk)
 include device/google/shusky/audio/shiba/factory-audio-tables.mk
+# Override to factory SDK
+$(call soong_config_set, gpssdk, sdkv1, True)
+$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT))
 
 PRODUCT_NAME := factory_shiba
 PRODUCT_DEVICE := shiba