diff --git a/system/camerad/cameras/camera_qcom2.cc b/system/camerad/cameras/camera_qcom2.cc
index df5b9e8bf0..091b0d91d9 100644
--- a/system/camerad/cameras/camera_qcom2.cc
+++ b/system/camerad/cameras/camera_qcom2.cc
@@ -97,11 +97,15 @@ const int ANALOG_GAIN_MIN_IDX_AR0231 = 0x1; // 0.25x
 const int ANALOG_GAIN_REC_IDX_AR0231 = 0x6; // 0.8x
 const int ANALOG_GAIN_MAX_IDX_AR0231 = 0xD; // 4.0x
 const int ANALOG_GAIN_COST_DELTA_AR0231 = 0;
+const float ANALOG_GAIN_COST_LOW_AR0231 = 0.1;
+const float ANALOG_GAIN_COST_HIGH_AR0231 = 5.0;
 
 const int ANALOG_GAIN_MIN_IDX_OX03C10 = 0x0;
 const int ANALOG_GAIN_REC_IDX_OX03C10 = 0x11; // 2.5x
 const int ANALOG_GAIN_MAX_IDX_OX03C10 = 0x36;
 const int ANALOG_GAIN_COST_DELTA_OX03C10 = -1;
+const float ANALOG_GAIN_COST_LOW_OX03C10 = 0.05;
+const float ANALOG_GAIN_COST_HIGH_OX03C10 = 0.8;
 
 const int EXPOSURE_TIME_MIN_AR0231 = 2; // with HDR, fastest ss
 const int EXPOSURE_TIME_MAX_AR0231 = 0x0855; // with HDR, slowest ss, 40ms
@@ -535,6 +539,8 @@ void CameraState::camera_set_parameters() {
     analog_gain_rec_idx = ANALOG_GAIN_REC_IDX_AR0231;
     analog_gain_max_idx = ANALOG_GAIN_MAX_IDX_AR0231;
     analog_gain_cost_delta = ANALOG_GAIN_COST_DELTA_AR0231;
+    analog_gain_cost_low = ANALOG_GAIN_COST_LOW_AR0231;
+    analog_gain_cost_high = ANALOG_GAIN_COST_HIGH_AR0231;
     for (int i=0; i<=analog_gain_max_idx; i++) {
       sensor_analog_gains[i] = sensor_analog_gains_AR0231[i];
     }
@@ -552,6 +558,8 @@ void CameraState::camera_set_parameters() {
     analog_gain_rec_idx = ANALOG_GAIN_REC_IDX_OX03C10;
     analog_gain_max_idx = ANALOG_GAIN_MAX_IDX_OX03C10;
     analog_gain_cost_delta = ANALOG_GAIN_COST_DELTA_OX03C10;
+    analog_gain_cost_low = ANALOG_GAIN_COST_LOW_OX03C10;
+    analog_gain_cost_high = ANALOG_GAIN_COST_HIGH_OX03C10;
     for (int i=0; i<=analog_gain_max_idx; i++) {
       sensor_analog_gains[i] = sensor_analog_gains_OX03C10[i];
     }
@@ -1108,7 +1116,7 @@ void CameraState::set_camera_exposure(float grey_frac) {
       float score = std::abs(desired_ev - (t * gain)) * 10;
 
       // Going below recommended gain needs lower penalty to not overexpose
-      float m = g > analog_gain_rec_idx ? 5.0 : 0.1;
+      float m = g > analog_gain_rec_idx ? analog_gain_cost_high : analog_gain_cost_low;
       score += std::abs(g - (int)analog_gain_rec_idx) * m;
 
       // LOGE("cam: %d - gain: %d, t: %d (%.2f), score %.2f, score + gain %.2f, %.3f, %.3f", camera_num, g, t, desired_ev / gain, score, score + std::abs(g - gain_idx) * (score + 1.0) / 10.0, desired_ev, min_ev);
diff --git a/system/camerad/cameras/camera_qcom2.h b/system/camerad/cameras/camera_qcom2.h
index 150ea0a1c0..9f0c3743f1 100644
--- a/system/camerad/cameras/camera_qcom2.h
+++ b/system/camerad/cameras/camera_qcom2.h
@@ -42,6 +42,8 @@ public:
   int analog_gain_max_idx;
   int analog_gain_rec_idx;
   int analog_gain_cost_delta;
+  float analog_gain_cost_low;
+  float analog_gain_cost_high;
 
   float cur_ev[3];
   float min_ev, max_ev;