diff --git a/audio/caiman/audio-tables.mk b/audio/caiman/audio-tables.mk
index b099b18b..62ceb92d 100644
--- a/audio/caiman/audio-tables.mk
+++ b/audio/caiman/audio-tables.mk
@@ -17,7 +17,7 @@
 AUDIO_TABLE_FOLDER := caiman
 
 # Choose AIDL config by build flag.
-ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
 PRODUCT_PACKAGES += audio_aidl_configs
 
diff --git a/audio/komodo/audio-tables.mk b/audio/komodo/audio-tables.mk
index 9fca044d..ff4e4e46 100644
--- a/audio/komodo/audio-tables.mk
+++ b/audio/komodo/audio-tables.mk
@@ -17,7 +17,7 @@
 AUDIO_TABLE_FOLDER := komodo
 
 # Choose AIDL config by build flag.
-ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
 PRODUCT_PACKAGES += audio_aidl_configs
 
diff --git a/audio/tokay/audio-tables.mk b/audio/tokay/audio-tables.mk
index 3e0b9cea..842d1313 100644
--- a/audio/tokay/audio-tables.mk
+++ b/audio/tokay/audio-tables.mk
@@ -17,7 +17,7 @@
 AUDIO_TABLE_FOLDER := tokay
 
 # Choose AIDL config by build flag.
-ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
 PRODUCT_PACKAGES += audio_aidl_configs
 
diff --git a/device-caiman.mk b/device-caiman.mk
index d626791e..4ad6b967 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -33,8 +33,8 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
 # display
 DEVICE_PACKAGE_OVERLAYS += device/google/caimito/caiman/overlay
 
-include device/google/caimito/audio/caiman/audio-tables.mk
 include device/google/zumapro/device-shipping-common.mk
+include device/google/caimito/audio/caiman/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/syna/syna20.mk
diff --git a/device-komodo.mk b/device-komodo.mk
index a14bbfc8..5e416eaf 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -33,8 +33,8 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
 # display
 DEVICE_PACKAGE_OVERLAYS += device/google/caimito/komodo/overlay
 
-include device/google/caimito/audio/komodo/audio-tables.mk
 include device/google/zumapro/device-shipping-common.mk
+include device/google/caimito/audio/komodo/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/syna/syna20.mk
diff --git a/device-tokay.mk b/device-tokay.mk
index a5b849e3..6b2811d2 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -26,8 +26,8 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
 # display
 DEVICE_PACKAGE_OVERLAYS += device/google/caimito/tokay/overlay
 
-include device/google/caimito/audio/tokay/audio-tables.mk
 include device/google/zumapro/device-shipping-common.mk
+include device/google/caimito/audio/tokay/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/syna/syna20.mk