diff --git a/device-cheetah.mk b/device-cheetah.mk
index 202adcc..40d30bd 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -30,8 +30,8 @@ include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs101/bluetooth/bluetooth.mk
 include device/google/gs201/uwb/uwb.mk
 
-SOONG_CONFIG_lyric_tuning_product := cheetah
-SOONG_CONFIG_google3a_config_target_device := cheetah
+$(call soong_config_set,lyric,tuning_product,cheetah)
+$(call soong_config_set,google3a_config,target_device,cheetah)
 
 # Init files
 PRODUCT_COPY_FILES += \
diff --git a/device-cloudripper.mk b/device-cloudripper.mk
index 4ac2ed0..437a18b 100644
--- a/device-cloudripper.mk
+++ b/device-cloudripper.mk
@@ -27,8 +27,8 @@ include device/google/pantah/audio/cloudripper/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs101/bluetooth/bluetooth.mk
 
-SOONG_CONFIG_lyric_tuning_product := cloudripper
-SOONG_CONFIG_google3a_config_target_device := cloudripper
+$(call soong_config_set,lyric,tuning_product,cloudripper)
+$(call soong_config_set,google3a_config,target_device,cloudripper)
 
 # Init files
 PRODUCT_COPY_FILES += \
diff --git a/device-panther.mk b/device-panther.mk
index bd0da11..36c1c09 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -29,8 +29,8 @@ include device/google/pantah/audio/panther/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs101/bluetooth/bluetooth.mk
 
-SOONG_CONFIG_lyric_tuning_product := panther
-SOONG_CONFIG_google3a_config_target_device := panther
+$(call soong_config_set,lyric,tuning_product,panther)
+$(call soong_config_set,google3a_config,target_device,panther)
 
 # Init files
 PRODUCT_COPY_FILES += \
diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk
index 9db0f3c..c02136a 100644
--- a/device-ravenclaw.mk
+++ b/device-ravenclaw.mk
@@ -28,8 +28,8 @@ include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs101/bluetooth/bluetooth.mk
 include device/google/gs201/uwb/uwb.mk
 
-SOONG_CONFIG_lyric_tuning_product := cloudripper
-SOONG_CONFIG_google3a_config_target_device := cloudripper
+$(call soong_config_set,lyric,tuning_product,cloudripper)
+$(call soong_config_set,google3a_config,target_device,cloudripper)
 
 # Init files
 PRODUCT_COPY_FILES += \