diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 7251380..76d7c97 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -107,7 +107,7 @@ TARGET_BOARD_INFO_FILE := $(VENDOR_PATH)/board-info.txt
 # Camera
 USE_DEVICE_SPECIFIC_CAMERA := true
 TARGET_PROCESS_SDK_VERSION_OVERRIDE := \
-    /system/vendor/bin/hw/android.hardware.camera.provider@2.4-service=24
+    /system/bin/cameraserver=24
 TARGET_USES_MEDIA_EXTENSIONS := true
 
 # Charger
diff --git a/manifest.xml b/manifest.xml
index 22d3869..2ebf250 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -37,7 +37,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.camera.provider</name>
-        <transport>hwbinder</transport>
+        <transport arch="32+64">passthrough</transport>
         <version>2.4</version>
         <interface>
             <name>ICameraProvider</name>
@@ -104,7 +104,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
-        <transport>hwbinder</transport>
+        <transport arch="32+64">passthrough</transport>
         <version>2.1</version>
         <interface>
             <name>IComposer</name>
diff --git a/msm8976.mk b/msm8976.mk
index 76fda50..47f8318 100644
--- a/msm8976.mk
+++ b/msm8976.mk
@@ -119,7 +119,6 @@ PRODUCT_PACKAGES += \
 # Camera
 PRODUCT_PACKAGES += \
     android.hardware.camera.provider@2.4-impl \
-    android.hardware.camera.provider@2.4-service \
     camera.msm8952 \
     libshims_camera
 
@@ -133,7 +132,6 @@ PRODUCT_PACKAGES += \
     android.hardware.graphics.allocator@2.0-impl \
     android.hardware.graphics.allocator@2.0-service \
     android.hardware.graphics.composer@2.1-impl \
-    android.hardware.graphics.composer@2.1-service \
     android.hardware.graphics.mapper@2.0-impl \
     android.hardware.memtrack@1.0-impl \
     android.hardware.memtrack@1.0-service \
diff --git a/sepolicy/cameraserver.te b/sepolicy/cameraserver.te
new file mode 100644
index 0000000..dd10c92
--- /dev/null
+++ b/sepolicy/cameraserver.te
@@ -0,0 +1,4 @@
+allow cameraserver camera_data_file:dir w_dir_perms;
+
+allow cameraserver sysfs_camera:dir search;
+allow cameraserver sysfs_camera:file rw_file_perms;
diff --git a/sepolicy/hal_camera_default.te b/sepolicy/hal_camera_default.te
deleted file mode 100644
index f733af5..0000000
--- a/sepolicy/hal_camera_default.te
+++ /dev/null
@@ -1,5 +0,0 @@
-allow hal_camera_default camera_data_file:dir w_dir_perms;
-allow hal_camera_default camera_data_file:sock_file write;
-
-allow hal_camera_default sysfs_camera:dir search;
-allow hal_camera_default sysfs_camera:file rw_file_perms;