diff --git a/device-felix.mk b/device-felix.mk
index a0f3cc4..0aa5682 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -282,6 +282,10 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.camera.redact_exif=1
 
+# Increase thread priority for nodes stop
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.vendor.camera.increase_thread_priority_nodes_stop=true
+
 ##Audio Vendor property
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=true
diff --git a/powerhint.json b/powerhint.json
index aab1378..77b9a06 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -834,7 +834,7 @@
       "PowerHint": "CAMERA_SHOT",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 300,
-      "Value": "9999999"
+      "Value": "1826000"
     },
     {
       "PowerHint": "CAMERA_SHOT",
@@ -846,7 +846,7 @@
       "PowerHint": "CAMERA_SHOT",
       "Node": "CPUMidClusterMinFreq",
       "Duration": 300,
-      "Value": "9999999"
+      "Value": "1836000"
     },
     {
       "PowerHint": "CAMERA_BACKEND_BOOST",