diff --git a/camera/android.hardware.camera.provider@2.5-service_64.rpi.rc b/camera/android.hardware.camera.provider@2.5-service_64.rpi.rc
deleted file mode 100644
index a36f1c5..0000000
--- a/camera/android.hardware.camera.provider@2.5-service_64.rpi.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-service vendor.camera-provider-2-5 /vendor/bin/hw/android.hardware.camera.provider@2.5-service_64
-    class hal
-    user cameraserver
-    group audio camera input drmrpc
-    ioprio rt 4
-    capabilities SYS_NICE
-    task_profiles CameraServiceCapacity MaxPerformance
-    override
-    setenv LIBCAMERA_LOG_LEVELS *:WARN
-    setenv LIBCAMERA_LOG_FILE syslog
diff --git a/device.mk b/device.mk
index 4cee707..a9a2e6a 100644
--- a/device.mk
+++ b/device.mk
@@ -62,13 +62,10 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.camera.external.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.external.xml
 
 PRODUCT_PACKAGES += \
-    android.hardware.camera.provider@2.5-service_64 \
+    android.hardware.camera.provider-V1-libcamera-service \
     camera.libcamera \
     ipa_rpi_vc4
 
-PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/camera/android.hardware.camera.provider@2.5-service_64.rpi.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.camera.provider@2.5-service_64.rpi.rc
-
 PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)/camera/camera_hal.yaml:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/camera_hal.yaml \
     external/libcamera/src/ipa/rpi/vc4/data/imx219.json:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/ipa/rpi/vc4/imx219.json \
diff --git a/framework_compatibility_matrix.xml b/framework_compatibility_matrix.xml
index 21068cf..e2a73b5 100644
--- a/framework_compatibility_matrix.xml
+++ b/framework_compatibility_matrix.xml
@@ -1,13 +1,4 @@
 <compatibility-matrix version="1.0" type="framework">
-    <hal format="hidl">
-        <name>android.hardware.camera.provider</name>
-        <transport>hwbinder</transport>
-        <version>2.5</version>
-        <interface>
-            <name>ICameraProvider</name>
-            <instance>legacy/0</instance>
-        </interface>
-    </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.media.c2</name>
         <transport>hwbinder</transport>
diff --git a/manifest.xml b/manifest.xml
index fcf2f80..397d516 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -23,15 +23,7 @@
         <interface>
             <name>ICameraProvider</name>
             <instance>external/0</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.camera.provider</name>
-        <transport>hwbinder</transport>
-        <version>2.5</version>
-        <interface>
-            <name>ICameraProvider</name>
-            <instance>legacy/0</instance>
+            <instance>libcamera/0</instance>
         </interface>
     </hal>
 </manifest>
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index bf37843..7d1ed02 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -1,3 +1,6 @@
+# Camera
+/vendor/bin/hw/android\.hardware\.camera\.provider-V1-libcamera-service  u:object_r:hal_camera_default_exec:s0
+
 # CEC
 /dev/cec0  u:object_r:cec_device:s0
 /dev/cec1  u:object_r:cec_device:s0
diff --git a/sepolicy/service_contexts b/sepolicy/service_contexts
index 123bed2..9d6f3bf 100644
--- a/sepolicy/service_contexts
+++ b/sepolicy/service_contexts
@@ -1,3 +1,7 @@
+# Camera
+android.hardware.camera.provider.ICameraProvider/external/0   u:object_r:hal_camera_service:s0
+android.hardware.camera.provider.ICameraProvider/libcamera/0  u:object_r:hal_camera_service:s0
+
 # DRM
 android.hardware.drm.IDrmFactory/widevine  u:object_r:hal_drm_service:s0