diff --git a/device.mk b/device.mk
index 747cb54..81046fc 100755
--- a/device.mk
+++ b/device.mk
@@ -129,14 +129,7 @@ PRODUCT_COPY_FILES += \
 
 # Camera
 PRODUCT_PACKAGES += \
-    android.frameworks.displayservice@1.0_32 \
-    android.hardware.camera.provider@2.4-impl:32 \
-    android.hardware.camera.provider@2.4-service \
-    camera.device@1.0-impl \
-    camera.device@3.2-impl \
-    camera.device@3.3-impl \
-    camera.device@3.4-impl \
-    camera.device@3.5-impl \
+    android.hardware.camera.provider@2.5-service \
     libcameraclient_shim \
     Snap
 
diff --git a/manifest.xml b/manifest.xml
index 7911713..68bc487 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -480,15 +480,6 @@
             <instance>exthealth</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>vendor.samsung.hardware.camera.provider</name>
-        <transport>hwbinder</transport>
-        <version>2.4</version>
-        <interface>
-            <name>ISecCameraProvider</name>
-            <instance>legacy/0</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>vendor.samsung.hardware.gnss</name>
         <transport>hwbinder</transport>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 677ba7b..927161f 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -163,15 +163,13 @@ lib/libuniplugin.so
 lib/libwideselfie.arcsoft.so
 lib/libvdis_core.so
 lib/libvdis_interface.so
-lib/vendor.samsung.hardware.camera.device@1.0.so
-lib/vendor.samsung.hardware.camera.device@3.2.so
-lib/vendor.samsung.hardware.camera.device@3.3.so
-lib/vendor.samsung.hardware.camera.device@3.4.so
-lib/vendor.samsung.hardware.camera.provider@2.4.so
-lib/vendor.samsung.hardware.camera.provider@2.5.so
 vendor/bin/mm-qcamera-daemon
 vendor/lib/hw/camera.msm8996.so
-vendor/lib/hw/vendor.samsung.hardware.camera.provider@2.4-impl.so
+vendor/lib/camera.device@1.0-impl.so
+vendor/lib/camera.device@3.2-impl.so
+vendor/lib/camera.device@3.3-impl.so
+vendor/lib/camera.device@3.4-external-impl.so
+vendor/lib/camera.device@3.4-impl.so
 vendor/lib/libedge_smooth_hvx_stub.so
 vendor/lib/libflash_pmic.so
 vendor/lib/libjpegdhw.so
@@ -240,10 +238,6 @@ vendor/lib/libhumantracking_util.camera.samsung.so
 vendor/lib/libsmart_cropping.camera.samsung.so
 vendor/lib/libsomp.camera.samsung.so
 vendor/lib/libxcv.camera.samsung.so
-vendor/lib/vendor.samsung.camera.device@1.0-impl.so
-vendor/lib/vendor.samsung.camera.device@3.2-impl.so
-vendor/lib/vendor.samsung.camera.device@3.3-impl.so
-vendor/lib/vendor.samsung.camera.device@3.4-impl.so
 
 # Camera (firmware)
 etc/firmware/C12QL_Isp0_s5k2l1sx.bin:vendor/firmware/C12QL_Isp0_s5k2l1sx.bin
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 466b586..7e2c85c 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -171,7 +171,6 @@
 /(vendor|system/vendor)/bin/hw/android\.hardware\.light@2\.0-service\.samsung                      u:object_r:hal_light_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.usb@1\.1-service\.gts3l                          u:object_r:hal_usb_default_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.livedisplay@2\.0-service\.samsung-qcom             u:object_r:hal_lineage_livedisplay_sysfs_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.camera\.provider@2\.4-service            u:object_r:hal_camera_default_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.miscpower@1\.0-service                   u:object_r:hal_power_default_exec:s0
 
 # Rootfs
diff --git a/sepolicy/hwservice_contexts b/sepolicy/hwservice_contexts
index f6a3f09..3188d7e 100644
--- a/sepolicy/hwservice_contexts
+++ b/sepolicy/hwservice_contexts
@@ -2,7 +2,6 @@ vendor.samsung.hardware.bluetooth.a2dp::ISecBluetoothAudioOffload
 vendor.samsung.hardware.bluetooth.a2dpsink::ISecBluetoothA2dpSinkProvidersFactory      u:object_r:hal_bluetooth_a2dp_hwservice:s0
 vendor.samsung.hardware.bluetooth.audio::ISecBluetoothAudioProvidersFactory            u:object_r:hal_audio_hwservice:s0
 vendor.samsung.hardware.bluetooth::ISecBluetooth                                       u:object_r:hal_bluetooth_hwservice:s0
-vendor.samsung.hardware.camera.provider::ISecCameraProvider                            u:object_r:hal_camera_hwservice:s0
 vendor.samsung.hardware.gnss::ISecGnss                                                 u:object_r:hal_gnss_hwservice:s0
 vendor.samsung.hardware.health::ISecHealth                                             u:object_r:hal_health_hwservice:s0
 vendor.samsung.hardware.miscpower::ISecMiscPower                                       u:object_r:hal_miscpower_hwservice:s0