diff --git a/device-caiman.mk b/device-caiman.mk
index 8cd03a91..8ef21252 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -33,6 +33,9 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
 # Disable modem until b/291009607 is fixed
 BOARD_WITHOUT_RADIO := true
 
+# 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 hardware/google/pixel/vibrator/cs40l26/device.mk
@@ -45,9 +48,6 @@ $(call soong_config_set,lyric,camera_hardware,caiman)
 $(call soong_config_set,lyric,tuning_product,caiman)
 $(call soong_config_set,google3a_config,target_device,caiman)
 
-# display
-DEVICE_PACKAGE_OVERLAYS += device/google/caimito/caiman/overlay
-
 # Init files
 PRODUCT_COPY_FILES += \
 	device/google/caimito/conf/init.caiman.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.caiman.rc
diff --git a/device-komodo.mk b/device-komodo.mk
index 08cbbbd6..e6db2116 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -33,6 +33,9 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
 # Disable modem until b/291009607 is fixed
 BOARD_WITHOUT_RADIO := true
 
+# 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 hardware/google/pixel/vibrator/cs40l26/device.mk
@@ -45,8 +48,6 @@ $(call soong_config_set,lyric,camera_hardware,komodo)
 $(call soong_config_set,lyric,tuning_product,komodo)
 $(call soong_config_set,google3a_config,target_device,komodo)
 
-# display
-DEVICE_PACKAGE_OVERLAYS += device/google/caimito/komodo/overlay
 # Display RRS default Config
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.display.primary.boot_config=1008x2244@120
 # TODO: b/250788756 - the property will be phased out after HWC loads user-preferred mode
diff --git a/device-tokay.mk b/device-tokay.mk
index e714ee44..9bbc6102 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -26,6 +26,9 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
 # Disable modem until b/291009607 is fixed
 BOARD_WITHOUT_RADIO := true
 
+# 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 hardware/google/pixel/vibrator/cs40l26/device.mk
@@ -38,9 +41,6 @@ $(call soong_config_set,lyric,camera_hardware,tokay)
 $(call soong_config_set,lyric,tuning_product,tokay)
 $(call soong_config_set,google3a_config,target_device,tokay)
 
-# display
-DEVICE_PACKAGE_OVERLAYS += device/google/caimito/tokay/overlay
-
 # display color data
 PRODUCT_COPY_FILES += \
 	device/google/caimito/tokay/panel_config_google-tk4b_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/panel_config_google-tk4b_cal0.pb