Remove alpha flags from values and add conditional checks before setting flags through helm

Remove alpha flags from values and add conditional checks before setting flags through helm #2627