diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index ce7c0b7f..b065cf7e 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -32,7 +32,7 @@ TARGET_CPU_ABI := arm64-v8a
 TARGET_CPU_VARIANT := cortex-a55
 TARGET_CPU_VARIANT_RUNTIME := cortex-a55
 
-ifeq (,$(filter %_64,$(TARGET_PRODUCT)))
+ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
 TARGET_2ND_ARCH := arm
 TARGET_2ND_ARCH_VARIANT := armv8-a
 TARGET_2ND_CPU_ABI := armeabi-v7a
diff --git a/aosp_common.mk b/aosp_common.mk
index 1ad6eb71..e4e68635 100644
--- a/aosp_common.mk
+++ b/aosp_common.mk
@@ -17,11 +17,12 @@
 #
 # All components inherited here go to system image
 #
-ifeq (,$(filter %_64,$(TARGET_PRODUCT)))
+ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 else
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
 endif
+
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
 
 # Enable CSI checking
diff --git a/device.mk b/device.mk
index 6eef6009..b4d31b9f 100644
--- a/device.mk
+++ b/device.mk
@@ -18,7 +18,7 @@ include device/google/gs-common/device.mk
 
 TARGET_BOARD_PLATFORM := gs101
 
-ifneq (,$(filter %_64,$(TARGET_PRODUCT)))
+ifneq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
 LOCAL_64ONLY := _64
 endif
 
@@ -899,7 +899,7 @@ ifneq ($(BOARD_WITHOUT_RADIO),true)
 $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
 endif
 
-ifeq (,$(filter %_64,$(TARGET_PRODUCT)))
+ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 else
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)