diff --git a/target/board/treble_common_64.mk b/target/board/treble_common_64.mk
index 0a6eb172d..f27208f4e 100644
--- a/target/board/treble_common_64.mk
+++ b/target/board/treble_common_64.mk
@@ -16,6 +16,10 @@
 
 include build/make/target/board/treble_common.mk
 
+# Enable both 32 and 64 bits APP support
+TARGET_SUPPORTS_32_BIT_APPS := true
+TARGET_SUPPORTS_64_BIT_APPS := true
+
 # Enable 64-bits binder
 TARGET_USES_64_BIT_BINDER := true
 
diff --git a/target/product/treble_common_64.mk b/target/product/treble_common_64.mk
index fc3c16f8c..e555b09c5 100644
--- a/target/product/treble_common_64.mk
+++ b/target/product/treble_common_64.mk
@@ -32,6 +32,3 @@ include build/make/target/product/treble_common.mk
 PRODUCT_COPY_FILES += \
     system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc \
     system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc
-
-TARGET_SUPPORTS_32_BIT_APPS := true
-TARGET_SUPPORTS_64_BIT_APPS := true