diff --git a/a10/device.mk b/a10/device.mk
index 68008aa..548f317 100644
--- a/a10/device.mk
+++ b/a10/device.mk
@@ -6,7 +6,7 @@ TARGET_BOARD_HAS_FP := false
 # Inherit common device configuration
 $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk)
 
-$(call inherit-product, vendor/samsung/a10-arm64/a10-vendor.mk)
+$(call inherit-product, vendor/samsung/a10/a10-vendor.mk)
 
 $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
 
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 47c9a38..951131d 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -1,9 +1,5 @@
 # Call proprietary blob setup
-ifneq ($(findstring a20, $(TARGET_PRODUCT)),)
 $(call inherit-product, vendor/samsung/universal7885-common/universal7885-common-vendor.mk)
-else ifneq ($(findstring a40, $(TARGET_PRODUCT)),)
-$(call inherit-product, vendor/samsung/universal7904-common/universal7904-common-vendor.mk)
-endif
 
 # Build Fingerprints
 $(call inherit-product, $(LOCAL_PATH)/fingerprint.mk)