diff --git a/a10/device.mk b/a10/device.mk
index 6e3beb8..68008aa 100644
--- a/a10/device.mk
+++ b/a10/device.mk
@@ -1,5 +1,8 @@
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
+TARGET_BOARD_CAMERA_COUNT := 2
+TARGET_BOARD_HAS_FP := false
+
 # Inherit common device configuration
 $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk)
 
diff --git a/a40/device.mk b/a40/device.mk
index 07a166e..0097999 100644
--- a/a40/device.mk
+++ b/a40/device.mk
@@ -1,5 +1,7 @@
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
+BOARD_SUPPORTS_EUREKA_FMRADIO := false
+
 # Inherit common device configuration
 $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk)
 
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index d45a4cf..3d782c6 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -55,7 +55,8 @@ PRODUCT_COPY_FILES += \
     hardware/samsung_slsi/libbt/conf/bt_vendor.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor.conf
 
 # Camera
-ifeq ($(findstring a10, $(TARGET_PRODUCT)),)
+TARGET_BOARD_CAMERA_COUNT ?= 3
+ifeq ($(TARGET_BOARD_CAMERA_COUNT), 3)
 PRODUCT_PACKAGES += \
     android.hardware.camera.provider@2.5-service.exynos7885
 else
@@ -83,14 +84,16 @@ PRODUCT_PACKAGES += \
     android.hardware.drm@1.2.vendor \
     android.hardware.drm@1.3.vendor
 
-ifeq ($(findstring a10, $(TARGET_PRODUCT)),)
 # Fingerprint
+TARGET_BOARD_HAS_FP ?= true
+ifeq ($(TARGET_BOARD_HAS_FP), true)
 PRODUCT_PACKAGES += \
     android.hardware.biometrics.fingerprint@2.3-service.samsung
 endif
 
-ifeq ($(findstring a40, $(TARGET_PRODUCT)),)
 # Samsung FMRadio impl
+BOARD_SUPPORTS_EUREKA_FMRADIO ?= true
+ifeq ($(BOARD_SUPPORTS_EUREKA_FMRADIO), true)
 PRODUCT_PACKAGES += \
     FMRadio
 endif