hello the yellow flame is solved by performing a good cleaning of the pilot and burner assembly for this you have to disassemble and remove said assembly to clean, did you control how many minutes the burner works when it starts to heat the water? it may be that for a while the unitrol or temperature control is failing once you have done the cleaning, retest the operation and if it does not change, the next step is to check the unitrol greetings.