diff --git a/BoardConfig.mk b/BoardConfig.mk
index 760fc0141a2b9a7f77059722f191c2e5ac3635b2..b76161fb76f973625f8f67787030233361e1f75f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -51,6 +51,7 @@ BOARD_SUPPORTS_SOUND_TRIGGER := true
 TARGET_BOOTLOADER_BOARD_NAME := FP4
 
 # Camera
+TARGET_CAMERA_EXPOSE_CLIENTPKGNAME := true
 TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED := true
 
 # Display
@@ -173,6 +174,7 @@ VENDOR_SECURITY_PATCH := 2024-07-05
 include device/qcom/sepolicy_vndr/SEPolicy.mk
 BOARD_VENDOR_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor
 SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/private
+SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/public
 
 # Verified Boot
 BOARD_AVB_ENABLE := true
diff --git a/extract-files.sh b/extract-files.sh
index 6d6fef74fcda45273bef08fc1bddaa912485fc62..b23028b4ce88868affabb6493c2c0d8b8f89e188 100644
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -64,6 +64,18 @@ function blob_fixup() {
         vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.bitra.so)
             "${SIGSCAN}" -p "13 0a 00 94" -P "1F 20 03 D5" -f "${2}"
             ;;
+        vendor/lib64/camera/components/com.qti.node.gpu.so)
+            sed -i 's|vendor.debug.camera.pkgname|debug.camera.packagename\x00\x00\x00|g' "${2}"
+            ;;
+        vendor/lib64/hw/camera.qcom.so)
+            sed -i 's|vendor.debug.camera.pkgname|debug.camera.packagename\x00\x00\x00|g' "${2}"
+            ;;
+        vendor/lib64/hw/com.qti.chi.override.bitra.so)
+            sed -i 's|vendor.debug.camera.pkgname|debug.camera.packagename\x00\x00\x00|g' "${2}"
+            ;;
+        vendor/lib64/hw/com.qti.chi.override.so)
+            sed -i 's|vendor.debug.camera.pkgname|debug.camera.packagename\x00\x00\x00|g' "${2}"
+            ;;
         vendor/lib64/hw/fingerprint.lito.so)
             sed -i 's|fpsensor_fingerprint\x00|fingerprint\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00|g' "${2}"
             ;;
diff --git a/sepolicy/private/property_contexts b/sepolicy/private/property_contexts
index e3ea0fc1910b1961891f5271353765447eb0fb40..c27bf34c93dafb57f42d250c20dd2e54631bb20a 100644
--- a/sepolicy/private/property_contexts
+++ b/sepolicy/private/property_contexts
@@ -1,2 +1,5 @@
+# Camera
+debug.camera.packagename u:object_r:debug_camera_prop:s0
+
 # Radio
-persist.ril.sim.mcc.mnc u:object_r:radio_prop:s0
+persist.ril.sim.mcc.mnc  u:object_r:radio_prop:s0
diff --git a/sepolicy/public/property.te b/sepolicy/public/property.te
new file mode 100644
index 0000000000000000000000000000000000000000..0334ca2b527d263a5f5ef28899a07120408e1616
--- /dev/null
+++ b/sepolicy/public/property.te
@@ -0,0 +1,2 @@
+# Camera
+system_public_prop(debug_camera_prop)
diff --git a/sepolicy/vendor/cameraserver.te b/sepolicy/vendor/cameraserver.te
new file mode 100644
index 0000000000000000000000000000000000000000..c730fb4bdcc0824dda2bcfb67aea03760970b8c3
--- /dev/null
+++ b/sepolicy/vendor/cameraserver.te
@@ -0,0 +1 @@
+set_prop(cameraserver, debug_camera_prop)
diff --git a/sepolicy/vendor/hal_camera.te b/sepolicy/vendor/hal_camera.te
new file mode 100644
index 0000000000000000000000000000000000000000..e0ceab4f2cd01e60bcc9deecc69c33a4c4e061e4
--- /dev/null
+++ b/sepolicy/vendor/hal_camera.te
@@ -0,0 +1 @@
+get_prop(hal_camera, debug_camera_prop)
diff --git a/vendor.prop b/vendor.prop
index f5eeba051a7a5493412f9ccc612da743426e857d..ff88f387adbd232c3d608ae48131297354be76c8 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -108,9 +108,6 @@ persist.vendor.dpmhalservice.enable=1
 # FM
 vendor.hw.fm.init=0
 
-# FPCamera
-vendor.debug.camera.pkgname=com.fp.camera
-
 # FRP
 ro.frp.pst=/dev/block/bootdevice/by-name/frp