diff --git a/aiq/aiq_input_parameters.cpp b/aiq/aiq_input_parameters.cpp
index 5dd2f6c..7a6a1fa 100644
--- a/aiq/aiq_input_parameters.cpp
+++ b/aiq/aiq_input_parameters.cpp
@@ -170,8 +170,8 @@ void AiqInputParameters::setAeAwbAfDefaults()
 	};
 
 	/* GBCE Params */
-	gbceParams.gbce_level = ia_aiq_gbce_level_bypass;
-	gbceParams.tone_map_level = ia_aiq_tone_map_level_default;
+	gbceParams.gbce_level = ia_aiq_gbce_level_use_tuning;
+	gbceParams.tone_map_level = ia_aiq_tone_map_level_use_tuning;
 	gbceParams.frame_use = ia_aiq_frame_use_preview;
 	gbceParams.ev_shift = 0;