diff --git a/camera/camera_hal.yaml b/camera/libcamera/camera_hal.yaml
similarity index 100%
rename from camera/camera_hal.yaml
rename to camera/libcamera/camera_hal.yaml
diff --git a/device.mk b/device.mk
index 8c1cc84..8a931ba 100644
--- a/device.mk
+++ b/device.mk
@@ -61,12 +61,12 @@ 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-V1-libcamera-service \
-    camera.libcamera \
-    ipa_rpi_pisp
+    com.android.hardware.camera.libcamera
+
+$(call soong_config_set,libcamera,ipa,pisp)
 
 PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/camera/camera_hal.yaml:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/camera_hal.yaml
+    $(DEVICE_PATH)/camera/libcamera/camera_hal.yaml:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/camera_hal.yaml
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.camera.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.xml \
diff --git a/manifest.xml b/manifest.xml
index f71c1a8..326beec 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -23,7 +23,6 @@
         <interface>
             <name>ICameraProvider</name>
             <instance>external/0</instance>
-            <instance>libcamera/0</instance>
         </interface>
     </hal>
 </manifest>
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 595e64a..8fbc156 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -1,6 +1,3 @@
-# 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