diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 336990e..265802b 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -101,9 +101,6 @@ USE_CUSTOM_AUDIO_POLICY := 1
 # Bluetooth
 TARGET_USE_QTI_BT_STACK := true
 
-# Camera
-TARGET_USES_QTI_CAMERA_DEVICE := true
-
 # Display
 TARGET_USES_COLOR_METADATA := true
 TARGET_USES_DISPLAY_RENDER_INTENTS := true
diff --git a/common.mk b/common.mk
index 374de4d..513023b 100644
--- a/common.mk
+++ b/common.mk
@@ -192,6 +192,8 @@ PRODUCT_PACKAGES_DEBUG += \
 PRODUCT_PACKAGES += \
     android.hardware.camera.provider@2.4-impl \
     android.hardware.camera.provider@2.4-service_64 \
+    libcamera2ndk_vendor \
+    vendor.qti.hardware.camera.device@1.0.vendor \
     vendor.qti.hardware.camera.postproc@1.0.vendor
 
 # Common init scripts