diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 34da79f..7bfca33 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -23,6 +23,10 @@ $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-v
 $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/tangorpro/proprietary/tangorpro/device-vendor-tangorpro.mk)
 
+DEVICE_PACKAGE_OVERLAYS += device/google/tangorpro/tangorpro/overlay
+PRODUCT_SOONG_NAMESPACES += device/google/tangorpro
+PRODUCT_PACKAGES += WifiOverlayT6pro
+
 include device/google/gs201/device-shipping-common.mk
 include device/google/tangorpro/audio/tangorpro/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
@@ -30,10 +34,6 @@ include hardware/google/pixel/vibrator/cs40l26/device.mk
 $(call soong_config_set,lyric,tuning_product,cloudripper)
 $(call soong_config_set,google3a_config,target_device,cloudripper)
 
-DEVICE_PACKAGE_OVERLAYS += device/google/tangorpro/tangorpro/overlay
-PRODUCT_SOONG_NAMESPACES += device/google/tangorpro
-PRODUCT_PACKAGES += WifiOverlayT6pro
-
 # Touch files
 PRODUCT_COPY_FILES += \
         device/google/tangorpro/NVTCapacitiveTouchScreen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/NVTCapacitiveTouchScreen.idc \