diff --git a/device-oriole.mk b/device-oriole.mk
index 990c305..d512e33 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -39,8 +39,8 @@ else
 include device/google/gs101/fingerprint/udfps_factory.mk
 endif
 
-SOONG_CONFIG_lyric_tuning_product := oriole
-SOONG_CONFIG_google3a_config_target_device := oriole
+$(call soong_config_set,lyric,tuning_product,oriole)
+$(call soong_config_set,google3a_config,target_device,oriole)
 
 # Init files
 PRODUCT_COPY_FILES += \
diff --git a/device-raven.mk b/device-raven.mk
index 7f2df2b..bc5dfd0 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -45,8 +45,8 @@ endif
 
 include hardware/google/pixel/vibrator/cs40l25/device.mk
 
-SOONG_CONFIG_lyric_tuning_product := raven
-SOONG_CONFIG_google3a_config_target_device := raven
+$(call soong_config_set,lyric,tuning_product,raven)
+$(call soong_config_set,google3a_config,target_device,raven)
 
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.support_kernel_idle_timer=true
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.enable_frame_rate_override=true
diff --git a/device-slider.mk b/device-slider.mk
index 26ea3a0..72fa1ec 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -28,8 +28,8 @@ include device/google/gs101/device-common.mk
 include device/google/raviole/audio/slider/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l25/device.mk
 
-SOONG_CONFIG_lyric_tuning_product := slider
-SOONG_CONFIG_google3a_config_target_device := slider
+$(call soong_config_set,lyric,tuning_product,slider)
+$(call soong_config_set,google3a_config,target_device,slider)
 
 # WirelessCharger
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 1b1d5c3..370f885 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -28,8 +28,8 @@ include device/google/gs101/device-common.mk
 include hardware/google/pixel/vibrator/drv2624/device.mk
 include device/google/raviole/audio/whitefin/audio-tables.mk
 
-SOONG_CONFIG_lyric_tuning_product := slider
-SOONG_CONFIG_google3a_config_target_device := slider
+$(call soong_config_set,lyric,tuning_product,slider)
+$(call soong_config_set,google3a_config,target_device,slider)
 
 # WirelessCharger
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml